Skip to content

Commit cbf727f

Browse files
committed
refactor(utils): miscellaneous
* use relocated utils and remove pymake dependency * move n-point cross-section functions from modflow6
1 parent bd51afa commit cbf727f

File tree

17 files changed

+385
-210
lines changed

17 files changed

+385
-210
lines changed

.github/workflows/benchmark.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ jobs:
5757
shell: bash -l {0}
5858
run: |
5959
pip install --upgrade pip
60-
pip install https://github.com/modflowpy/pymake/zipball/master
6160
pip install xmipy
6261
pip install .
6362

.github/workflows/commit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ jobs:
194194
if: runner.os == 'Windows'
195195
run: |
196196
pip install --upgrade pip
197-
pip install https://github.com/modflowpy/pymake/zipball/master
198197
pip install xmipy
199198
pip install .
200199

.github/workflows/examples.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
shell: bash -l {0}
5757
run: |
5858
pip install --upgrade pip
59-
pip install https://github.com/modflowpy/pymake/zipball/master
6059
pip install xmipy
6160
pip install .
6261

.github/workflows/regression.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
shell: bash -l {0}
5757
run: |
5858
pip install --upgrade pip
59-
pip install https://github.com/modflowpy/pymake/zipball/master
6059
pip install xmipy
6160
pip install .
6261

CONTRIBUTING.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ Before you submit your Pull Request (PR) consider the following guidelines:
6666

6767
```shell
6868
cd autotest
69-
pytest -v ci_prepare.py
70-
pytest -v
69+
pytest -v -n auto
7170
```
72-
Note: the FloPy test suite requires the [pytest](https://pypi.org/project/pytest/) and [pymake](https://github.com/modflowpy/pymake) python packages. All the FloPy dependencies must also be installed for the tests to pass.
71+
72+
**Note**: the FloPy test suite requires the [pytest](https://pypi.org/project/pytest/) and [modflow-devtools](https://github.com/MODFLOW-USGS/modflow-devtools) python packages. Be sure to install all optional dependencies as described in the [developer docs](DEVELOPER.md), as tests will be skipped if optional dependencies are not found.
73+
74+
**Note:** you will either need to exclude notebooks when checking in your changeset or restore them after running the full test suite, to avoid including large volumes of execution metadata with your PR.
7375

7476
7. Commit your changes using a descriptive commit message that follows our
7577
[commit message conventions](#commit). Adherence to these conventions

autotest/regression/test_lgr.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@
77
from modflow_devtools.markers import requires_exe, requires_pkg
88

99
import flopy
10+
from flopy.utils.compare import compare_heads
1011

1112

1213
@flaky
1314
@requires_exe("mflgr")
14-
@requires_pkg("pymake")
1515
@pytest.mark.regression
1616
def test_simplelgr(function_tmpdir, example_data_path):
1717
"""Test load and write of distributed MODFLOW-LGR example problem."""
18-
import pymake
19-
2018
mflgr_v2_ex3_path = example_data_path / "mflgr_v2" / "ex3"
2119

2220
ws = function_tmpdir / mflgr_v2_ex3_path.stem
@@ -66,12 +64,12 @@ def test_simplelgr(function_tmpdir, example_data_path):
6664
print("compare parent results")
6765
pth0 = join(ws, "ex3_parent.nam")
6866
pth1 = join(model_ws2, "ex3_parent.nam")
69-
success = pymake.compare_heads(pth0, pth1)
67+
success = compare_heads(pth0, pth1)
7068
assert success, "parent heads do not match"
7169

7270
# compare child results
7371
print("compare child results")
7472
pth0 = join(ws, "ex3_child.nam")
7573
pth1 = join(model_ws2, "ex3_child.nam")
76-
success = pymake.compare_heads(pth0, pth1)
74+
success = compare_heads(pth0, pth1)
7775
assert success, "child heads do not match"

0 commit comments

Comments
 (0)