Skip to content

Commit

Permalink
feat(PRT): add scripts/notebooks for PRT examples
Browse files Browse the repository at this point in the history
  • Loading branch information
wpbonelli committed Sep 7, 2023
1 parent 7b01930 commit bacd765
Show file tree
Hide file tree
Showing 10 changed files with 7,636 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .doc/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
is_CI = "CI" in os.environ or os.environ.get("READTHEDOCS") == "True"

# -- update flopy classes ----------------------------------------------------
flopy.mf6.utils.generate_classes(branch="develop", backup=False)
flopy.mf6.utils.generate_classes(owner="aprovost-usgs", branch="PRT", backup=False)

# -- update notebooks and tables ---------------------------------------------
pth = os.path.join("..", "scripts")
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/ex-rtd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,22 @@ on:
schedule:
- cron: '0 2 * * *' # run at 2 AM UTC
push:
branches:
branches:
- master
- develop
- ci-*
- PRT
paths-ignore:
- 'README.md'
- 'DEVELOPER.md'
pull_request:
branches:
branches:
- master
- develop
- PRT
paths-ignore:
- 'README.md'
- 'DEVELOPER.md'

jobs:
rtd_build:
Expand Down Expand Up @@ -68,16 +73,17 @@ jobs:
- name: Update flopy MODFLOW 6 classes
run: |
import flopy
flopy.mf6.utils.generate_classes(branch="develop", backup=False)
flopy.mf6.utils.generate_classes(owner="aprovost-usgs", ref="PRT", backup=False)
shell: python

- name: Install MODFLOW executables release
uses: modflowpy/install-modflow-action@v1

- name: Install MODFLOW nightly-build executables
- name: Install MODFLOW 6 PRT build
uses: modflowpy/install-modflow-action@v1
with:
repo: modflow6-nightly-build
owner: aprovost-usgs
repo: modflow6

- name: Run scripts without model runs
run: pytest -v -n=auto --durations=0 ci_build_files.py
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/ex-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ on:
- master
- develop
- ci-*
- PRT
paths-ignore:
- 'README.md'
- 'DEVELOPER.md'
pull_request:
branches:
branches:
- master
- develop
- PRT
paths-ignore:
- 'README.md'
- 'DEVELOPER.md'
Expand Down Expand Up @@ -55,7 +57,7 @@ jobs:
- name: Update flopy MODFLOW 6 classes
run: |
import flopy
flopy.mf6.utils.generate_classes(branch="develop", backup=False)
flopy.mf6.utils.generate_classes(owner="aprovost-usgs", ref="PRT", backup=False)
shell: python

- name: Install MODFLOW executables release
Expand Down Expand Up @@ -130,25 +132,24 @@ jobs:
- name: Update flopy MODFLOW 6 classes
run: |
import flopy
flopy.mf6.utils.generate_classes(branch="develop", backup=False)
flopy.mf6.utils.generate_classes(owner="aprovost-usgs", ref="PRT", backup=False)
shell: python

- name: Install MODFLOW executables release
uses: modflowpy/install-modflow-action@v1

- name: Install MODFLOW nightly-build executables
- name: Install MODFLOW 6 PRT build
uses: modflowpy/install-modflow-action@v1
with:
repo: modflow6-nightly-build
owner: aprovost-usgs
repo: modflow6

- name: Run scripts
run: |
pytest -v -n=auto --durations=0 --run=True ci_build_files.py
run: pytest -v -n=auto --durations=0 --run=True ci_build_files.py
working-directory: ${{env.etc-directory}}

- name: Run processing script
run: |
python process-scripts.py
run: python process-scripts.py
working-directory: ${{env.script-directory}}

- name: Build mf6examples LaTeX document
Expand Down
4 changes: 2 additions & 2 deletions etc/requirements.usgs.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
git+https://github.com/modflowpy/flopy.git@develop
git+https://github.com/MODFLOW-USGS/modflowapi.git@develop
https://github.com/w-bonelli/flopy/archive/prt-utils.zip
https://github.com/MODFLOW-USGS/modflowapi/archive/develop.zip
Loading

0 comments on commit bacd765

Please sign in to comment.