update

Author: Jeff Whitaker

.travis.yml

@@ -14,77 +14,76 @@ env:
 
 language: python
 sudo: required
-dist: bionic
 services: docker
 
 matrix:
   include:
-#   - os: linux
-#     env:
-#       - MB_PYTHON_VERSION=3.6
-#   - os: linux
-#     env:
-#       - MB_PYTHON_VERSION=3.6
-#       - PLAT=i686
-#   - os: linux
-#     env:
-#       - MB_PYTHON_VERSION=3.7
-#       - NP_BUILD_DEP="1.17.3"
-#       - NP_TEST_DEP="1.17.3"
-#   - os: linux
-#     env:
-#       - MB_PYTHON_VERSION=3.7
-#       - PLAT=i686
-#       - NP_BUILD_DEP="1.17.3"
-#       - NP_TEST_DEP="1.17.3"
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.6
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.6
+        - PLAT=i686
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.7
+        - NP_BUILD_DEP="1.17.3"
+        - NP_TEST_DEP="1.17.3"
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.7
+        - PLAT=i686
+        - NP_BUILD_DEP="1.17.3"
+        - NP_TEST_DEP="1.17.3"
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.8
         - NP_BUILD_DEP="1.17.3"
         - NP_TEST_DEP="1.17.3"
-#   - os: linux
-#     env:
-#       - MB_PYTHON_VERSION=3.8
-#       - PLAT=i686
-#       - NP_BUILD_DEP="1.17.3"
-#       - NP_TEST_DEP="1.17.3"
-#   - os: linux
-#     env:
-#       - MB_PYTHON_VERSION=3.9
-#       - NP_BUILD_DEP="1.19.4"
-#       - NP_TEST_DEP="1.19.4"
-#   - os: linux
-#     env:
-#       - MB_PYTHON_VERSION=3.9
-#       - PLAT=i686
-#       - NP_BUILD_DEP="1.19.4"
-#       - NP_TEST_DEP="1.19.4"
-#   - os: osx
-#     language: generic
-#     env:
-#       - MB_PYTHON_VERSION=3.6
-#       - MB_PYTHON_OSX_VER=10.9
-#   - os: osx
-#     language: generic
-#     env:
-#       - MB_PYTHON_VERSION=3.7
-#       - MB_PYTHON_OSX_VER=10.9
-#       - NP_BUILD_DEP="1.17.3"
-#       - NP_TEST_DEP="1.17.3"
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.8
+        - PLAT=i686
+        - NP_BUILD_DEP="1.17.3"
+        - NP_TEST_DEP="1.17.3"
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.9
+        - NP_BUILD_DEP="1.19.4"
+        - NP_TEST_DEP="1.19.4"
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.9
+        - PLAT=i686
+        - NP_BUILD_DEP="1.19.4"
+        - NP_TEST_DEP="1.19.4"
+    - os: osx
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=3.6
+        - MB_PYTHON_OSX_VER=10.9
+    - os: osx
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=3.7
+        - MB_PYTHON_OSX_VER=10.9
+        - NP_BUILD_DEP="1.17.3"
+        - NP_TEST_DEP="1.17.3"
     - os: osx
       language: generic
       env:
         - MB_PYTHON_VERSION=3.8
         - MB_PYTHON_OSX_VER=10.9
         - NP_BUILD_DEP="1.17.3"
         - NP_TEST_DEP="1.17.3"
-#   - os: osx
-#     language: generic
-#     env:
-#       - MB_PYTHON_VERSION=3.9
-#       - MB_PYTHON_OSX_VER=10.9
-#       - NP_BUILD_DEP="1.19.4"
-#       - NP_TEST_DEP="1.19.4"
+    - os: osx
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=3.9
+        - MB_PYTHON_OSX_VER=10.9
+        - NP_BUILD_DEP="1.19.4"
+        - NP_TEST_DEP="1.19.4"
 
 before_install:
     - BUILD_DEPENDS="numpy==$NP_BUILD_DEP Cython setuptools>=18.0"

config.sh

@@ -13,7 +13,10 @@ source h5py-wheels/config.sh
 function build_libs {
     build_hdf5
     build_curl
-    build_netcdf2
+    if [ -z "$IS_OSX" ]; then
+       export CFLAGS="-std=gnu99 -Wl,-strip-all"
+    fi
+    build_netcdf
 }
 
 function pip_opts {
@@ -25,18 +28,3 @@ function run_tests {
     cp ../netcdf4-python/test/* .
     python run_all.py
 }
-
-function build_netcdf2 {
-    if [ -e netcdf-stamp ]; then return; fi
-    build_hdf5
-    build_curl
-    fetch_unpack https://github.com/Unidata/netcdf-c/archive/v${NETCDF_VERSION}.tar.gz
-    if [ -z "$IS_OSX" ]; then
-       export CFLAGS="-std=gnu99 -Wl,-strip-all"
-    fi
-    (cd netcdf-c-${NETCDF_VERSION} \
-        && ./configure --prefix=$BUILD_PREFIX --enable-dap \
-        && make -j4 \
-        && make install)
-    touch netcdf-stamp
-}