GeezerVison

I have fixed the failing FutureWarning test. Could you please rebase onto current main?

I have fixed the failing FutureWarning test. Could you please rebase onto current main?

Sorry, how do I do that again? I just tried using these instructions and not sure it worked.

Sorry, how do I do that again? I just tried using these instructions and not sure it worked.

Those instructions are not complete for your case. Your PR comes from basicmachines/main. That makes it a bit more complicated than our own instructions in https://github.com/python-control/python-control/wiki/How-to-contribute-with-a-pull-request

You need to:

option A

1. Sync your fork on https://github.com/basicmachines/python-control-2/tree/main using the sync fork button
2. Assuming your local machine has above repository as remote "origin":

git fetch origin
git rebase origin/main
git push -f

option B

# on branch main tracking basicmachines:main (https://github.com/basicmachines/python-control-2/tree/main)
git remote add upstreamhttps://github.com/python-control/python-control.git
git fetch upstream
git rebase upstream/main
git push -f

(Why do you have two forks? Better work with properly named feature branches)

(Why do you have two forks? Better work with properly named feature branches)

Sorry I probably shouldn't have created another fork. The previous fork has all that work I did on the plot functions previously (I shared a link to it with Richard in case he needs to refer to it). It's all far behind the origin now.

I'll fix that conditional statement so no test is needed and re-submit the PR.

I committed the change so it should be ready to merge now. I only ran the statefbk_test.py tests and there are still two fails but I don't think these are anything to do with the changes I made:

XFAIL control/tests/statefbk_test.py::TestStatefbk::testLQR_warning - warning not implemented
XFAIL control/tests/statefbk_test.py::TestStatefbk::testDLQR_warning - warning not implemented

coverage: 94.425% (+0.003%) from 94.422%
when pulling 0836ad8 on basicmachines:main
into 7a70be1 on python-control:main.

XFAIL

That is an "Expected fail" and nothing to worry about here.

You still need to rebase to current upstream/main (e1e33e4).

The current diff (https://github.com/python-control/python-control/pull/969/files) and commit list (https://github.com/python-control/python-control/pull/969/commits) shows changes from Henrik's and my merged PRs which we do not want to duplicate.

git switch main
git remote -v | grep 'upstream.*python-control/python-control' || git remote add upstream https://github.com/python-control/python-control.git
git fetch upstream
git rebase upstream/main
git push -f

@billtubbs if you're getting tied up doing a rebase (as has often happened to me) maybe easier would be to try working on a fresh branch from an up-to-date main and re-doing your changes by hand?

Hi Ben, Sawyer, sorry I got distracted and forgot to finish this. Thanks for the reminder I will get back to it this week.

@billtubbs I'm likely to release a new version of python-control in the next day or two. If you have a chance to rebase this PR, I'll include it in the v0.10.0 (otherwise v0.10.1).

Sorry for delay. I just rebased it using your earlier instructions and it seemed to work. Running the tests again now...

Tests seemed to work. Is this success?

3550 passed, 30 skipped, 11 xfailed, 5 warnings in 133.34s (0:02:13)

Thanks @billtubbs. The test output looks fine.