update

Author: jswhit

.travis.yml

@@ -20,72 +20,72 @@ 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
+    - 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.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: 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"
 
 before_install:
     - BUILD_DEPENDS="numpy==$NP_BUILD_DEP Cython setuptools>=18.0"

config.sh

@@ -43,11 +43,10 @@ function build_curl {
         build_openssl
     fi
     fetch_unpack https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz
-    export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
     (cd curl-${CURL_VERSION} \
         && if [ -z "$IS_OSX" ]; then \
         LIBS=-ldl ./configure $flags; else \
-        ./configure $flags; fi\
+        env PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig ./configure $flags; fi\
         && make -j4 \
         && make install)
     touch curl-stamp