diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index eba412d900..e72415c424 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -69,7 +69,7 @@ jobs: working-directory: ./autotest run: | mkdir -p .benchmarks - pytest -v --color=yes --durations=0 --benchmark-only --benchmark-json .benchmarks/${{ matrix.os }}_python${{ matrix.python-version }}.json --keep-failed=.failed + pytest -v --durations=0 --benchmark-only --benchmark-json .benchmarks/${{ matrix.os }}_python${{ matrix.python-version }}.json --keep-failed=.failed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -79,7 +79,7 @@ jobs: working-directory: ./autotest run: | mkdir -p .benchmarks - pytest -v --color=yes --durations=0 --benchmark-only --benchmark-json .benchmarks/${{ matrix.os }}_python${{ matrix.python-version }}.json --keep-failed=.failed + pytest -v --durations=0 --benchmark-only --benchmark-json .benchmarks/${{ matrix.os }}_python${{ matrix.python-version }}.json --keep-failed=.failed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index dad0c098cf..5e5163f5ce 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -131,7 +131,7 @@ jobs: - name: Smoke test working-directory: autotest - run: pytest -v -n=auto --smoke --color=yes --cov=flopy --cov-report=xml --durations=0 --keep-failed=.failed + run: pytest -v -n=auto --smoke --cov=flopy --cov-report=xml --durations=0 --keep-failed=.failed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -226,7 +226,7 @@ jobs: if: runner.os != 'Windows' working-directory: ./autotest run: | - pytest -v -m="not example and not regression" -n=auto --color=yes --cov=flopy --cov-append --cov-report=xml --durations=0 --keep-failed=.failed --dist loadfile + pytest -v -m="not example and not regression" -n=auto --cov=flopy --cov-append --cov-report=xml --durations=0 --keep-failed=.failed --dist loadfile coverage report env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -236,7 +236,7 @@ jobs: shell: bash -l {0} working-directory: ./autotest run: | - pytest -v -m="not example and not regression" -n=auto --color=yes --cov=flopy --cov-append --cov-report=xml --durations=0 --keep-failed=.failed --dist loadfile + pytest -v -m="not example and not regression" -n=auto --cov=flopy --cov-append --cov-report=xml --durations=0 --keep-failed=.failed --dist loadfile coverage report env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index e0b4fb061c..fe9b014b3b 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -97,7 +97,7 @@ jobs: if: runner.os != 'Windows' working-directory: ./autotest run: | - pytest -v -m="example" -n=auto -s --color=yes --durations=0 --keep-failed=.failed + pytest -v -m="example" -n=auto -s --durations=0 --keep-failed=.failed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -106,7 +106,7 @@ jobs: shell: bash -l {0} working-directory: ./autotest run: | - pytest -v -m="example" -n=auto -s --color=yes --durations=0 --keep-failed=.failed + pytest -v -m="example" -n=auto -s --durations=0 --keep-failed=.failed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/mf6.yml b/.github/workflows/mf6.yml index 445eebf180..e1709ba687 100644 --- a/.github/workflows/mf6.yml +++ b/.github/workflows/mf6.yml @@ -82,12 +82,12 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} run: | - pytest -v --color=yes --durations=0 get_exes.py + pytest -v --durations=0 get_exes.py - name: Run tests working-directory: modflow6/autotest run: | - pytest -v --color=yes --cov=flopy --cov-report=xml --durations=0 -k "test_gw" -n auto + pytest -v --cov=flopy --cov-report=xml --durations=0 -k "test_gw" -n auto - name: Print coverage report before upload working-directory: ./modflow6/autotest diff --git a/.github/workflows/optional.yml b/.github/workflows/optional.yml index c3081a7ab1..ee29136542 100644 --- a/.github/workflows/optional.yml +++ b/.github/workflows/optional.yml @@ -62,7 +62,7 @@ jobs: - name: Smoke test (${{ matrix.optdeps }}) working-directory: autotest - run: pytest -v -n=auto --smoke --color=yes --cov=flopy --cov-report=xml --durations=0 --keep-failed=.failed + run: pytest -v -n=auto --smoke --cov=flopy --cov-report=xml --durations=0 --keep-failed=.failed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 097ff9efa0..972f1e1650 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -80,7 +80,7 @@ jobs: - name: Run regression tests if: runner.os != 'Windows' working-directory: ./autotest - run: pytest -v -m="regression" -n=auto --color=yes --durations=0 --keep-failed=.failed + run: pytest -v -m="regression" -n=auto --durations=0 --keep-failed=.failed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -88,7 +88,7 @@ jobs: if: runner.os == 'Windows' shell: bash -l {0} working-directory: ./autotest - run: pytest -v -m="regression" -n=auto --color=yes --durations=0 --keep-failed=.failed + run: pytest -v -m="regression" -n=auto --durations=0 --keep-failed=.failed env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bcd0af801d..e130f3a337 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,7 +71,7 @@ jobs: - name: Run tests working-directory: autotest - run: pytest -v -m="not example and not regression" -n=auto --color=yes --durations=0 --keep-failed=.failed --dist loadfile + run: pytest -v -m="not example and not regression" -n=auto --durations=0 --keep-failed=.failed --dist loadfile env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/rtd.yml b/.github/workflows/rtd.yml index 76d4f1b43b..b092e4b16e 100644 --- a/.github/workflows/rtd.yml +++ b/.github/workflows/rtd.yml @@ -79,7 +79,7 @@ jobs: - name: Run tutorial and example notebooks working-directory: autotest - run: pytest -v -n auto --color=yes test_notebooks.py + run: pytest -v -n auto test_notebooks.py - name: Upload notebooks artifact for ReadtheDocs if: github.repository_owner == 'modflowpy' && github.event_name == 'push' && runner.os == 'Linux' diff --git a/autotest/pytest.ini b/autotest/pytest.ini index 97931bb22a..8f4616fd37 100644 --- a/autotest/pytest.ini +++ b/autotest/pytest.ini @@ -1,5 +1,5 @@ [pytest] -addopts = -ra +addopts = -ra --color=yes python_files = test_*.py profile_*.py