diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 9b1db49..be660d9 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -91,7 +91,10 @@ jobs: run: | export PATH=/usr/share/miniconda/bin:$PATH coverage erase - coverage run --context=${{ matrix.os }}.py${{ matrix.python-version }} --source=chama --omit="*/tests/*" -m nose -v --nologcapture --with-doctest --doctest-extension=.rst --traverse-namespace documentation/*.rst chama + #coverage run --context=${{ matrix.os }}.py${{ matrix.python-version }} --source=chama --omit="*/tests/*" -m nose -v --nologcapture --with-doctest --doctest-extension=.rst --traverse-namespace documentation/*.rst chama + coverage run --context=${{ matrix.os }}.py${{ matrix.python-version }} --source=chama --omit="*/tests/*" -m pytest --doctest-modules --doctest-glob="*.rst" chama + coverage run --context=${{ matrix.os }}.py${{ matrix.python-version }} --source=chama --omit="*/tests/*" --append -m pytest --doctest-glob="*.rst" documentation + env: COVERAGE_FILE: .coverage.${{ matrix.python-version }}.${{ matrix.os }} - name: Save coverage diff --git a/documentation/developers.rst b/documentation/developers.rst index 58f6608..48a2613 100644 --- a/documentation/developers.rst +++ b/documentation/developers.rst @@ -24,9 +24,9 @@ The latest stable version is hosted on PyPI at https://pypi.python.org/pypi/cham **Testing:** Automated testing is run using TravisCI at https://travis-ci.org/sandialabs/chama. Test coverage statistics are collected using Coveralls at https://coveralls.io/github/sandialabs/chama. -Tests can be run locally using nosetests:: +Tests can be run locally using pytest:: - nosetests -v --with-coverage --cover-package=chama chama + pytest chama **Documentation:** Documentation is built using Read the Docs and hosted at https://chama.readthedocs.io. diff --git a/documentation/installation.rst b/documentation/installation.rst index ca27b7b..c497159 100644 --- a/documentation/installation.rst +++ b/documentation/installation.rst @@ -39,7 +39,7 @@ Optional Python package dependencies include: * Matplotlib [Hunt07]_: Used to produce graphics, http://matplotlib.org. -* nose: Used to run software tests, http://nose.readthedocs.io. +* pytest: Used to run software tests, https://docs.pytest.org/. Required Pyomo supported MIP solver: diff --git a/requirements.txt b/requirements.txt index c1e2935..bb75005 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ numpy scipy # Optional -nose +pytest matplotlib