Skip to content

Commit

Permalink
release(1.2.6): update mf6 version (#123)
Browse files Browse the repository at this point in the history
Rename autotests with more descriptive names
  • Loading branch information
jdhughes-usgs authored Dec 6, 2022
1 parent 6b3a1c7 commit 57d97d9
Show file tree
Hide file tree
Showing 30 changed files with 217 additions and 1,140 deletions.
2 changes: 1 addition & 1 deletion .github/common/install-python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

python -m pip install --upgrade pip
pip install wheel
pip install pytest pytest-cov pytest-xdist coverage
pip install pytest pytest-cov pytest-xdist pytest-dependency coverage
pip install appdirs matplotlib
pip install https://github.com/modflowpy/flopy/zipball/develop
pip install .
Expand Down
2 changes: 1 addition & 1 deletion .github/intel-scripts/ifortvars_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ ifort --version
icc --version

# run pytest
pytest -v -n=auto --dist=loadfile -m=regression --durations=0 --cov=pymake --cov-report=xml autotest/
pytest -v -n=auto --dist=loadfile -m="base or regression" --durations=0 --cov=pymake --cov-report=xml autotest/

2 changes: 1 addition & 1 deletion .github/intel-scripts/ifortvars_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ ifort --version
icc --version

# run pytest
pytest -v -n=auto --dist=loadfile -m=base --durations=0 --cov=pymake --cov-report=xml autotest/
pytest -v -n=auto --dist=loadfile -m="base" --durations=0 --cov=pymake --cov-report=xml autotest/

2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
shell: cmd
run: |
call ".github/intel-scripts/ifortvars_windows.bat"
pytest -v -m=base --durations=0 --cov=pymake --cov-report=xml autotest/
pytest -v -m="base" --durations=0 --cov=pymake --cov-report=xml autotest/
- name: Print coverage report before upload
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pymake-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Run pytest
run: |
pytest -v --dist=loadfile -n=auto -m regression --durations=0 --cov=pymake --cov-report=xml autotest/
pytest -v --dist=loadfile -n=auto -m="base or regression" --durations=0 --cov=pymake --cov-report=xml autotest/
- name: Print coverage report before upload
run: |
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
- name: Run pytest
run: |
pytest -v --dist=loadfile -n=auto -m base --durations=0 --cov=pymake --cov-report=xml autotest/
pytest -v --dist=loadfile -n=auto -m="base" --durations=0 --cov=pymake --cov-report=xml autotest/
- name: Print coverage report before upload
run: |
Expand Down Expand Up @@ -147,4 +147,4 @@ jobs:
- name: Run pytest
run: |
pytest -v --dist=loadfile -n=auto -m base --durations=0
pytest -v --dist=loadfile -n=auto -m="base" --durations=0
2 changes: 1 addition & 1 deletion .github/workflows/pymake-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Run pytest
run: |
pytest -v --dist=loadfile -n=auto -m requests --durations=0 --cov=pymake --cov-report=xml autotest/
pytest -v -n=auto -m requests --durations=0 --cov=pymake --cov-report=xml autotest/
- name: Print coverage report before upload
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Python package for compiling MODFLOW-based programs.

### Version 1.2.4
### Version 1.2.6

![pymake continuous integration](https://github.com/modflowpy/pymake/workflows/pymake%20continuous%20integration/badge.svg)
[![codecov](https://codecov.io/gh/modflowpy/pymake/branch/master/graph/badge.svg)](https://codecov.io/gh/modflowpy/pymake)
Expand Down
218 changes: 0 additions & 218 deletions autotest/t001_test_meson.py

This file was deleted.

Loading

0 comments on commit 57d97d9

Please sign in to comment.