Skip to content

Commit b330ad4

Browse files
committed
chore: exclude gridgen from pymake build
also use uv-compatible github repo dependency syntax in requirements.txt, and bump windows-2019 to 2022
1 parent 0fcc996 commit b330ad4

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ ubuntu-22.04, macos-13, macos-14, windows-2019 ]
14+
os: [ ubuntu-22.04, macos-13, macos-14, windows-2022 ]
1515
defaults:
1616
run:
1717
shell: bash -l {0}
@@ -86,7 +86,7 @@ jobs:
8686
command: |
8787
ostag="${{ steps.ostag.outputs.ostag }}"
8888
mkdir $ostag
89-
make-program : --appdir $ostag --zip $ostag.zip --verbose
89+
make-program : --appdir $ostag -ex gridgen --zip $ostag.zip --verbose
9090
make-program mf2005,mflgr,mfnwt,mfusg --appdir $ostag --double --keep --zip $ostag.zip --verbose
9191
if [[ "${{ matrix.os }}" == "macos-14" ]]; then
9292
make-program mf6 --appdir $ostag --keep --zip $ostag.zip --verbose --fflags='-O1'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-22.04, macos-13, macos-14, windows-2019]
21+
os: [ubuntu-22.04, macos-13, macos-14, windows-2022]
2222
defaults:
2323
run:
2424
shell: bash
@@ -90,7 +90,7 @@ jobs:
9090
command: |
9191
ostag="${{ steps.ostag.outputs.ostag }}"
9292
mkdir $ostag
93-
make-program : --appdir $ostag --zip $ostag.zip --verbose
93+
make-program : --appdir $ostag -ex gridgen --zip $ostag.zip --verbose
9494
make-program mf2005,mflgr,mfnwt,mfusg --appdir $ostag --double --keep --zip $ostag.zip --verbose
9595
if [[ "${{ matrix.os }}" == "macos-14" ]]; then
9696
make-program mf6 --appdir $ostag --keep --zip $ostag.zip --verbose --fflags='-O1'

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
wheel
2-
https://github.com/modflowpy/pymake/zipball/develop
3-
https://github.com/MODFLOW-ORG/modflow-devtools/zipball/develop
2+
https://github.com/modflowpy/pymake/archive/develop.zip
3+
https://github.com/MODFLOW-ORG/modflow-devtools/archive/develop.zip

0 commit comments

Comments
 (0)