ci fixes

MODFLOW-USGS · Jan 21, 2024 · a2f411f · a2f411f
1 parent c225ac6
commit a2f411f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/ex-rtd.yml b/.github/workflows/ex-rtd.yml
@@ -21,10 +21,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-    env:
-      script-directory: scripts
-      etc-directory: etc
-      test-directory: autotest
     defaults:
       run:
         shell: bash
@@ -58,12 +54,12 @@ jobs:
           python-version: 3.9
 
       - name: Install Python packages
+        working-directory: etc
         run: |
           python -m pip install --upgrade pip setuptools wheel
           pip install -r requirements.pip.txt
           pip install -r requirements.usgs.txt
           python -m ipykernel install --name python_kernel --user
-        working-directory: ${{env.etc-directory}}
 
       - name: Update flopy MODFLOW 6 classes
         run: python -m flopy.mf6.utils.generate_classes --ref develop --no-backup
@@ -76,20 +72,20 @@ jobs:
         with:
           repo: modflow6-nightly-build
 
-      - name: Create notebooks and run examples
+      - name: Create notebooks and run models
+        working-directory: autotest
         run: pytest -v -n=auto --durations=0 test_notebooks.py --plot
-        working-directory: ${{env.test-directory}}
 
       - name: Copy notebooks to RTD directory
         run: cp -R notebooks/*.ipynb .doc/_notebooks/
 
       - name: Run processing script
+        working-directory: scripts
         run: python process-scripts.py
-        working-directory: ${{env.script-directory}}
 
       - name: Create package tables and examples.rst for ReadtheDocs
+        working-directory: etc
         run: python ci_create_examples_rst.py
-        working-directory: ${{env.etc-directory}}
 
       - name: List example rst files for ReadtheDocs
         run: ls -R .doc/_examples/

diff --git a/.github/workflows/ex-workflow.yml b/.github/workflows/ex-workflow.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Create model
         working-directory: autotest
         # run the scripts via pytest without running the models, just build input files
-        run: pytest -v -n=auto --durations=0 test_scripts.py
+        run: pytest -v -n=auto --durations=0 test_scripts.py --init
 
       - name: zip input files
         run: |
@@ -73,10 +73,6 @@ jobs:
       fail-fast: false
       matrix:
         python: [3.9, "3.10", "3.11", "3.12"]
-    env:
-      script-directory: scripts
-      etc-directory: etc
-      test-directory: autotest
     defaults:
       run:
         shell: bash
@@ -106,12 +102,12 @@ jobs:
           python-version: ${{ matrix.python }}
 
       - name: Install Python packages
+        working-directory: etc
         run: |
           python -m pip install --upgrade pip setuptools wheel
           pip install -r requirements.pip.txt
           pip install -r requirements.usgs.txt
           python -m ipykernel install --name python_kernel --user
-        working-directory: ${{env.etc-directory}}
 
       - name: Update flopy MODFLOW 6 classes
         run: python -m flopy.mf6.utils.generate_classes --ref develop --no-backup
@@ -125,13 +121,13 @@ jobs:
           repo: modflow6-nightly-build
 
       - name: Test example scripts and create input files
+        working-directory: autotest
         run: pytest -v -n=auto --durations=0 test_scripts.py
-        working-directory: ${{env.test-directory}}
 
       - name: Run processing script
+        working-directory: scripts
         if: matrix.python == '3.9'
         run: python process-scripts.py
-        working-directory: ${{env.script-directory}}
 
       - name: Build mf6examples LaTeX document
         if: matrix.python == '3.9'
@@ -178,7 +174,6 @@ jobs:
           name: current
           path: mf6examples.pdf
 
-
   # make the release if the "build" job was successful
   release:
     name: Make the release