Skip to content

Commit 38bbabd

Browse files
jgoppertcwrowley
authored andcommitted
Updated testing suite to work with nosetests.
This required doing chmod -x * to remove executable permissions on the scripts. I renamed test_all.py to run_all.py so nosetest wouldn't attempt to run it as a test if someone made it non executable. Signed-off-by: Clancy Rowley <cwrowley@princeton.edu>
1 parent bdb3417 commit 38bbabd

8 files changed

Lines changed: 461 additions & 475 deletions

File tree

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
author = 'Richard Murray',
1010
author_email = 'murray@cds.caltech.edu',
1111
url = 'http://python-control.sourceforge.net',
12-
requires = ['scipy', 'matplotlib'],
12+
install_requires = ['scipy', 'matplotlib'],
13+
tests_require = ['scipy', 'matplotlib', 'nose'],
1314
package_dir = {'control' : 'src'},
1415
packages = ['control'],
16+
test_suite='nose.collector'
1517
)

tests/bdalg_test.py

100755100644
File mode changed.

tests/convert_test.py

100755100644
File mode changed.

tests/matlab_test.py

100755100644
File mode changed.
File renamed without changes.

tests/statesp_test.py

100755100644
File mode changed.

0 commit comments

Comments
 (0)