merge upstream/develop

EC-USGS · Dec 18, 2023 · 7f0b566 · 7f0b566
2 parents e0a700b + 708fe42
commit 7f0b566
Showing 1 changed file with 55 additions and 10 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -56,27 +56,72 @@ jobs:
           pip -V
           pip list
 
-      - name: Run available domains with PRMS and convert csv output to NetCDF
-        working-directory: test_data/scripts
+      - name: hru_1 - generate and manage test data domain, run PRMS and convert csv output to NetCDF
+        working-directory: autotest
+        run: |
+          python generate_test_data.py \
+            -n=auto --domain=hru_1 --remove_prms_csvs --remove_prms_output_dirs
+
+      - name: hru_1 - list netcdf input files
+        working-directory: test_data
+        run: |
+          find hru_1/output/ -name '*.nc'
+
+      - name: hru_1 - pywatershed tests
+        working-directory: autotest
+        run: pytest
+          -vv
+          -n=auto
+          --domain_yaml=../test_data/hru_1/hru_1.yaml
+          --durations=0
+          --cov=pywatershed
+          --cov-report=xml
+          --junitxml=pytest_hru_1.xml
+
+
+      - name: drb_2yr - generate and manage test data
+        working-directory: autotest
+        run: |
+          python generate_test_data.py \
+            -n=auto --domain=drb_2yr --remove_prms_csvs --remove_prms_output_dirs
+
+      - name: drb_2yr - list netcdf input files
+        working-directory: test_data
+        run: |
+          find drb_2yr/output/ -name '*.nc'
+
+      - name: drb_2yr - pywatershed tests
+        working-directory: autotest
+        run: pytest
+          -vv
+          -n=auto
+          --domain_yaml=../test_data/drb_2yr/drb_2yr.yaml
+          --durations=0
+          --cov=pywatershed
+          --cov-report=xml
+          --junitxml=pytest_drb_2yr.xml
+
+      - name: ucb_2yr - generate and manage test data
+        working-directory: autotest
         run: |
-          pytest -v -n=auto --durations=0 test_run_domains.py
-          pytest -v -n=auto --durations=0 test_nc_domains.py
+          python generate_test_data.py \
+            -n=auto --domain=ucb_2yr --remove_prms_csvs --remove_prms_output_dirs
 
-      - name: List all NetCDF files in test_data directory
+      - name: ucb_2yr - list netcdf input files
         working-directory: test_data
         run: |
-          find . -name "*.nc"
+          find ucb_2yr/output/ -name '*.nc'
 
-      - name: Run tests
+      - name: ucb_2yr - pywatershed tests
         working-directory: autotest
         run: pytest
-          -v
+          -vv
           -n=auto
+          --domain_yaml=../test_data/ucb_2yr/ucb_2yr.yaml
           --durations=0
-          --all_domains
           --cov=pywatershed
           --cov-report=xml
-          --junitxml=pytest.xml
+          --junitxml=pytest_ucb_2yr.xml
 
       - name: Update version
         id: version