Skip to content

Commit 57d97d9

Browse files
authored
release(1.2.6): update mf6 version (modflowpy#123)
Rename autotests with more descriptive names
1 parent 6b3a1c7 commit 57d97d9

30 files changed

+217
-1140
lines changed

.github/common/install-python.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
python -m pip install --upgrade pip
44
pip install wheel
5-
pip install pytest pytest-cov pytest-xdist coverage
5+
pip install pytest pytest-cov pytest-xdist pytest-dependency coverage
66
pip install appdirs matplotlib
77
pip install https://github.com/modflowpy/flopy/zipball/develop
88
pip install .

.github/intel-scripts/ifortvars_linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ ifort --version
1414
icc --version
1515

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

.github/intel-scripts/ifortvars_macos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ ifort --version
1111
icc --version
1212

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

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
shell: cmd
114114
run: |
115115
call ".github/intel-scripts/ifortvars_windows.bat"
116-
pytest -v -m=base --durations=0 --cov=pymake --cov-report=xml autotest/
116+
pytest -v -m="base" --durations=0 --cov=pymake --cov-report=xml autotest/
117117
118118
- name: Print coverage report before upload
119119
run: |

.github/workflows/pymake-gcc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Run pytest
4949
run: |
50-
pytest -v --dist=loadfile -n=auto -m regression --durations=0 --cov=pymake --cov-report=xml autotest/
50+
pytest -v --dist=loadfile -n=auto -m="base or regression" --durations=0 --cov=pymake --cov-report=xml autotest/
5151
5252
- name: Print coverage report before upload
5353
run: |
@@ -103,7 +103,7 @@ jobs:
103103
104104
- name: Run pytest
105105
run: |
106-
pytest -v --dist=loadfile -n=auto -m base --durations=0 --cov=pymake --cov-report=xml autotest/
106+
pytest -v --dist=loadfile -n=auto -m="base" --durations=0 --cov=pymake --cov-report=xml autotest/
107107
108108
- name: Print coverage report before upload
109109
run: |
@@ -147,4 +147,4 @@ jobs:
147147
148148
- name: Run pytest
149149
run: |
150-
pytest -v --dist=loadfile -n=auto -m base --durations=0
150+
pytest -v --dist=loadfile -n=auto -m="base" --durations=0

.github/workflows/pymake-requests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
3333
- name: Run pytest
3434
run: |
35-
pytest -v --dist=loadfile -n=auto -m requests --durations=0 --cov=pymake --cov-report=xml autotest/
35+
pytest -v -n=auto -m requests --durations=0 --cov=pymake --cov-report=xml autotest/
3636
3737
- name: Print coverage report before upload
3838
run: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Python package for compiling MODFLOW-based programs.
44

5-
### Version 1.2.4
5+
### Version 1.2.6
66

77
![pymake continuous integration](https://github.com/modflowpy/pymake/workflows/pymake%20continuous%20integration/badge.svg)
88
[![codecov](https://codecov.io/gh/modflowpy/pymake/branch/master/graph/badge.svg)](https://codecov.io/gh/modflowpy/pymake)

autotest/t001_test_meson.py

Lines changed: 0 additions & 218 deletions
This file was deleted.

0 commit comments

Comments
 (0)