* update

modflowpy · Jun 16, 2024 · 58ffea0 · 58ffea0
1 parent 133ab83
commit 58ffea0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -83,7 +83,18 @@ jobs:
         with:
           name: failed-schedule-${{ matrix.os }}-${{ matrix.FC }}-${{ matrix.FC_V }}
           path: ./autotest/.failed
-
+
+      - name: Print coverage report before upload
+        run: |
+          pixi run coverage-report
+  
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          file: ./autotest/coverage.xml
+
 
   pymake-os-compiler:
     name: pymake CI gcc on different OSs
@@ -145,16 +156,21 @@ jobs:
         if: runner.os == 'Windows'
         run: choco install make
 
-      - name: Run pytest on Linux and MacOS
-        if: runner.os != 'Windows'
+      - name: test on Linux
+        if: runner.os == 'Linux'
+        run: |
+          pixi run autotest
+
+      - name: test on MacOS
+        if: runner.os == 'macOS'
         run: |
           pixi run autotest-base
 
       - name: test on Windows
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
-          pixi run autotest-Windows
+          pixi run autotest-base
 
       - name: Upload failed test output
         if: failure()
@@ -163,4 +179,14 @@ jobs:
           name: failed-${{ matrix.os }}-${{ matrix.FC }}-${{ matrix.FC_V }}
           path: ./autotest/.failed
 
-
+      - name: Print coverage report before upload
+        run: |
+          pixi run coverage-report
+  
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          file: ./autotest/coverage.xml
+
diff --git a/autotest/test_cli_cmds.py b/autotest/test_cli_cmds.py
@@ -83,7 +83,6 @@ def test_make_program_all(module_tmpdir) -> None:
             "--appdir",
             str(module_tmpdir / "all"),
             "--verbose",
-            "--dryrun",
         ]
         run_cli_cmd(cmd)
 

diff --git a/autotest/test_mfusg.py b/autotest/test_mfusg.py
@@ -68,7 +68,7 @@ def run_mfusg(fn, exe):
 
 
 @pytest.mark.dependency(name="download")
-@pytest.mark.regrression
+@pytest.mark.regression
 def test_download(pm, pm_gsi, module_tmpdir, targets):
     pm.download_target(targets[0], download_path=module_tmpdir)
     assert pm.download, f"could not download {targets[0]}"