Merge 034d614 into 6b34896

.github/workflows/coverage.yaml

@@ -24,14 +24,16 @@ jobs:
           python-version: '3.11'
       - name: Update package index
         run: sudo apt-get update
-      - name: Install mpi libs
-        run: sudo apt-get -y install libopenmpi-dev
-      - name: Install Tox and any other packages
-        run: pip install tox
-      - name: Run Coverage Part 1
-        run: tox -e cov1
-      - name: Run Coverage Part 2
-        run: tox -e cov2 || true
+      - name: Install ARMI and MPI
+        run: |
+          sudo apt-get -y install libopenmpi-dev
+          pip install -e .[memprof,mpi,test]
+      - name: Run Coverage
+        run: |
+          coverage run --rcfile=.coveragerc -m pytest -n 4 --cov=armi --cov-config=.coveragerc --cov-report=lcov --ignore=venv armi
+          mpiexec -n 2 --use-hwthread-cpus coverage run --rcfile=.coveragerc -m pytest --cov=armi --cov-config=.coveragerc --cov-report=lcov --cov-append --ignore=venv armi/tests/test_mpiFeatures.py || true
+          mpiexec -n 2 --use-hwthread-cpus coverage run --rcfile=.coveragerc -m pytest --cov=armi --cov-config=.coveragerc --cov-report=lcov --cov-append --ignore=venv armi/tests/test_mpiParameters.py || true
+          coverage combine --rcfile=.coveragerc --keep -a
       - name: Publish to coveralls.io
         uses: coverallsapp/github-action@v1.1.2
         with:

.github/workflows/docs.yaml

@@ -22,12 +22,15 @@ jobs:
         run: sudo apt-get -y install libopenmpi-dev
       - name: Install Pandoc
         run: sudo apt-get -y install pandoc
-      - name: Install Tox and any other packages
-        run: pip install tox
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@v1
       - name: Make HTML Docs
-        run: tox -e doc
+        run: |
+          pip install -e .[memprof,mpi,test,docs]
+          cd doc
+          git submodule init
+          git submodule update
+          make html
       - name: deploy
         uses: JamesIves/github-pages-deploy-action@4.1.5
         with:

.github/workflows/linting.yaml

@@ -15,7 +15,7 @@ jobs:
           python-version: '3.9'
       - name: Update package index
         run: sudo apt-get update
-      - name: Install Tox and any other packages
-        run: pip install tox
       - name: Run Linter
-        run: tox -e lint
+        run:  |
+          pip install -e .[test]
+          ruff .

.github/workflows/unittests.yaml

@@ -26,7 +26,10 @@ jobs:
         run: sudo apt-get update
       - name: Install mpi libs
         run: sudo apt-get -y install libopenmpi-dev
-      - name: Install Tox and any other packages
-        run: pip install tox
-      - name: Run Tox
-        run: tox -e test,mpitest
+      - name: Run Tests and Coverage
+        run: |
+          pip install -e .[memprof,mpi,test]
+          pytest -n 4 armi
+          mpiexec -n 2 --use-hwthread-cpus coverage run --rcfile=.coveragerc -m pytest --cov=armi --cov-config=.coveragerc --cov-report=lcov --cov-append --ignore=venv armi/tests/test_mpiFeatures.py || true
+          mpiexec -n 2 --use-hwthread-cpus coverage run --rcfile=.coveragerc -m pytest --cov=armi --cov-config=.coveragerc --cov-report=lcov --cov-append --ignore=venv armi/tests/test_mpiParameters.py || true
+          coverage combine --rcfile=.coveragerc --keep -a

.github/workflows/validatemanifest.yaml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: '3.11'
-      - name: Install Tox and any other packages
-        run: pip install tox
-      - name: Run Tox
-        run: tox -e manifest
+      - name: Validate Manifest
+        run: |
+          pip install toml
+          python .github/workflows/validatemanifest.py

.github/workflows/wintests.yaml

@@ -21,9 +21,9 @@ jobs:
           python-version: '3.11'
       - name: Upgrade PIP
         run: python -m pip install --upgrade pip
-      - name: Install deps
-        run: python -m pip install tox tox-gh-actions
-      - name: Run Tox
-        run: tox -e test
+      - name: Run Unit Tests on Windows
+        run: |
+          pip install -e .[memprof,mpi,test]
+          pytest -n 4 armi
       - name: Find Test Crumbs
         run: python .github/workflows/find_test_crumbs.py

README.rst

@@ -79,16 +79,8 @@ Now clone and install ARMI::
     $ pip install -e .
     $ armi --help
 
-The easiest way to run the tests is to install `tox <https://tox.readthedocs.io/en/latest/>`_
-and then run::
-
-    $ pip install -e ".[test]"
-    $ tox -- -n 6
-
-This runs the unit tests in parallel on 6 processes. Omit the ``-n 6`` argument
-to run on a single process.
-
-The tests can also be run directly, using ``pytest``::
+The ARMI tests are meant to be run using `pytest <https://docs.pytest.org/en/8.0.x/>`_
+locally ::
 
     $ pip install -e ".[test]"
     $ pytest -n 4 armi

doc/developer/first_time_contributors.rst

@@ -28,17 +28,10 @@ Any contribution must pass all included unit tests. You will frequently have to
 tests your code changes break. And you should definitely add tests to cover anything
 new your code does.
 
-The standard way to run the tests is to install and use `tox <https://tox.readthedocs.io/en/latest/>`_::
+The ARMI tests are meant to be run using `pytest <https://docs.pytest.org/en/8.0.x/>`_
+locally ::
 
-    $ pip install tox
-    $ tox -- -n 6
-
-This runs the unit tests in parallel on 6 processes. Omit the ``-n 6`` argument
-to run on a single process.
-
-Or the tests can also be run using ``pytest`` directly::
-
-    $ pip intall -e .[test]
+    $ pip install -e .[test]
     $ pytest -n 4 armi
 
 Submitting Changes