Merge pull request #298 from CSHS-CWRA/try_standard_netcdf

Skip manual install of NetCDF-python binaries on macos
CSHS-CWRA · Jul 19, 2023 · 0a18cd9 · 0a18cd9
2 parents 4652695 + 470c8ec
commit 0a18cd9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,22 +37,22 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tox-env: py38
+          - tox-env: py38-linux
             python-version: "3.8"
             os: ubuntu-latest
-          - tox-env: py38
+          - tox-env: py38-macos
             python-version: "3.8"
             os: macos-latest
-          - tox-env: py39
+          - tox-env: py39-linux
             python-version: "3.9"
             os: ubuntu-latest
-          - tox-env: py310
+          - tox-env: py310-linux
             python-version: "3.10"
             os: ubuntu-latest
-          - tox-env: py311
+          - tox-env: py311-linux
             python-version: "3.11"
             os: ubuntu-latest
-          - tox-env: py311
+          - tox-env: py311-macos
             python-version: "3.11"
             os: macos-latest
     steps:

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 min_version = 4.0
 envlist =
     black
-    py{38,39,310,311}
+    py{38,39,310,311}-{linux,macos}
     docs
 requires =
     pip >=21.0
@@ -29,6 +29,9 @@ allowlist_externals =
     make
 
 [testenv]
+platform =
+    linux: linux
+    macos: darwin
 setenv =
     PYTEST_ADDOPTS = --numprocesses=logical --durations=10
 passenv =
@@ -50,8 +53,8 @@ deps =
     gdal == {env:GDAL_VERSION}
 commands =
     # Regenerate NetCDF4-Python wheel from source files
-    # Use older version due to errors in new version (https://github.com/Unidata/netcdf4-python/issues/1192)
-    python -m pip install --upgrade --force-reinstall --no-deps --no-cache-dir netcdf4==1.5.8 --no-binary netcdf4
+    # Rebuild netcdf4 on Linux due to errors in new version (https://github.com/Unidata/netcdf4-python/issues/1192)
+    linux: python -m pip install --upgrade --force-reinstall --no-deps --no-cache-dir netcdf4==1.6.4 --no-binary netcdf4
     # Rebuild GDAL in order to gain access to GDAL system-level objects
     python -m pip install --upgrade --force-reinstall --no-deps --no-cache-dir gdal=={env:GDAL_VERSION} --no-binary gdal
     # Run tests