Skip to content

Commit

Permalink
Replace doc references to nose by pytest
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
mstimberg committed Sep 24, 2020
1 parent 2b7ceb3 commit cefd2d1
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 19 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ docs_sphinx/reference

# Unit test / coverage reports
.coverage
nosetests.xml

# Eclipse project files and settings
.project
Expand Down
2 changes: 1 addition & 1 deletion dev/tools/run_tests.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Run all the non-standalone tests using nose. Exits with error code 1 if a test failed.
Run all the non-standalone tests using pytest. Exits with error code 1 if a test failed.
'''
import sys

Expand Down
2 changes: 1 addition & 1 deletion dev/tools/run_tests_standalone.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Run all the standalone tests using nose. Exits with error code 1 if a test failed.
Run all the standalone tests using pytest. Exits with error code 1 if a test failed.
'''
import sys

Expand Down
2 changes: 1 addition & 1 deletion dev/tools/run_tests_standalone_with_openmp.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Run all the standalone tests using nose. Exits with error code 1 if a test failed.
Run all the standalone tests using pytest. Exits with error code 1 if a test failed.
'''
import sys

Expand Down
2 changes: 1 addition & 1 deletion dev/tools/tests/run_tests_cython.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Run all the Cython tests using nose. Exits with error code 1 if a test failed.
Run all the Cython tests using pytest. Exits with error code 1 if a test failed.
'''
import sys

Expand Down
2 changes: 1 addition & 1 deletion dev/tools/tests/run_tests_cython_long.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Run all the Cython tests (including tests that take a long time) using nose.
Run all the Cython tests (including tests that take a long time) using pytest.
Exits with error code 1 if a test failed.
'''
import sys
Expand Down
2 changes: 1 addition & 1 deletion dev/tools/tests/run_tests_numpy.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Run all the numpy tests using nose. Exits with error code 1 if a test failed.
Run all the numpy tests using pytest. Exits with error code 1 if a test failed.
'''
import sys

Expand Down
2 changes: 1 addition & 1 deletion dev/tools/tests/run_tests_numpy_long.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'''
Run all the numpy tests (including tests that take a long time) using nose.
Run all the numpy tests (including tests that take a long time) using pytest.
Exits with error code 1 if a test failed.
'''
import sys
Expand Down
3 changes: 1 addition & 2 deletions docs_sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,7 @@ def __getattr__(cls, name):
'http://docs.python.org/': None,
'http://docs.scipy.org/doc/numpy': None,
'http://docs.scipy.org/doc/scipy/reference': None,
'http://docs.sympy.org/dev/': None,
'https://nose.readthedocs.io/en/latest/': None
'http://docs.sympy.org/dev/': None
}

autodoc_default_options = {'show-inheritance': True}
Expand Down
8 changes: 4 additions & 4 deletions docs_sphinx/introduction/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ packages as any other Anaconda package::
Installing other useful packages
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
There are various packages that are useful but not necessary for working with
Brian. These include: matplotlib_ (for plotting), nose_ (for running the test
Brian. These include: matplotlib_ (for plotting), pytest_ (for running the test
suite), ipython_ and jupyter_-notebook (for an interactive console). To install
them from anaconda, simply do::

conda install matplotlib nose ipython notebook
conda install matplotlib pytest ipython notebook

You should also have a look at the brian2tools_ package, which contains several
useful functions to visualize Brian 2 simulations and recordings. You can
Expand Down Expand Up @@ -162,7 +162,7 @@ Another option is to use ``pip`` to directly install from github::
Testing Brian
-------------

If you have the nose_ testing utility installed, you can run Brian's test
If you have the pytest_ testing utility installed, you can run Brian's test
suite::

import brian2
Expand All @@ -178,5 +178,5 @@ failures. For more control about the tests that are run see the
.. _brian2tools: https://brian2tools.readthedocs.io
.. _travis: https://travis-ci.org/brian-team/brian2
.. _azure: https://azure.microsoft.com/en-us/services/devops/pipelines/
.. _nose: https://pypi.python.org/pypi/nose
.. _pytest: https://docs.pytest.org/en/stable/
.. _Cython: http://cython.org/
5 changes: 0 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
[nosetests]
logging-clear-handlers=1
with-doctest=1
tests=brian2

[build_sphinx]
all-files=1
source-dir=docs_sphinx
Expand Down

0 comments on commit cefd2d1

Please sign in to comment.