Skip to content

Commit 2a44811

Browse files
author
Jeff Whitaker
committed
use manylinux 2014, update perl before building openssl
1 parent f175ab5 commit 2a44811

File tree

2 files changed

+89
-64
lines changed

2 files changed

+89
-64
lines changed

.travis.yml

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
- NP_TEST_DEP=1.17.3
99
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
1010
# manylinux version to build (1, 2010 or 2014)
11-
- MB_ML_VER=1
11+
- MB_ML_VER=2014
1212
# Following generated with
1313
# travis encrypt -r MacPython/netcdf4-python-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
1414
- secure:
@@ -20,72 +20,72 @@ services: docker
2020

2121
matrix:
2222
include:
23-
- os: linux
24-
env:
25-
- MB_PYTHON_VERSION=3.6
26-
- os: linux
27-
env:
28-
- MB_PYTHON_VERSION=3.6
29-
- PLAT=i686
30-
- os: linux
31-
env:
32-
- MB_PYTHON_VERSION=3.7
33-
- NP_BUILD_DEP="1.17.3"
34-
- NP_TEST_DEP="1.17.3"
35-
- os: linux
36-
env:
37-
- MB_PYTHON_VERSION=3.7
38-
- PLAT=i686
39-
- NP_BUILD_DEP="1.17.3"
40-
- NP_TEST_DEP="1.17.3"
41-
- os: linux
42-
env:
43-
- MB_PYTHON_VERSION=3.8
44-
- NP_BUILD_DEP="1.17.3"
45-
- NP_TEST_DEP="1.17.3"
46-
- os: linux
23+
# - os: linux
24+
# env:
25+
# - MB_PYTHON_VERSION=3.6
26+
# - os: linux
27+
# env:
28+
# - MB_PYTHON_VERSION=3.6
29+
# - PLAT=i686
30+
# - os: linux
31+
# env:
32+
# - MB_PYTHON_VERSION=3.7
33+
# - NP_BUILD_DEP="1.17.3"
34+
# - NP_TEST_DEP="1.17.3"
35+
# - os: linux
36+
# env:
37+
# - MB_PYTHON_VERSION=3.7
38+
# - PLAT=i686
39+
# - NP_BUILD_DEP="1.17.3"
40+
# - NP_TEST_DEP="1.17.3"
41+
# - os: linux
4742
env:
4843
- MB_PYTHON_VERSION=3.8
49-
- PLAT=i686
5044
- NP_BUILD_DEP="1.17.3"
5145
- NP_TEST_DEP="1.17.3"
52-
- os: linux
53-
env:
54-
- MB_PYTHON_VERSION=3.9
55-
- NP_BUILD_DEP="1.19.4"
56-
- NP_TEST_DEP="1.19.4"
57-
- os: linux
58-
env:
59-
- MB_PYTHON_VERSION=3.9
60-
- PLAT=i686
61-
- NP_BUILD_DEP="1.19.4"
62-
- NP_TEST_DEP="1.19.4"
63-
- os: osx
64-
language: generic
65-
env:
66-
- MB_PYTHON_VERSION=3.6
67-
- MB_PYTHON_OSX_VER=10.9
68-
- os: osx
69-
language: generic
70-
env:
71-
- MB_PYTHON_VERSION=3.7
72-
- MB_PYTHON_OSX_VER=10.9
73-
- NP_BUILD_DEP="1.17.3"
74-
- NP_TEST_DEP="1.17.3"
75-
- os: osx
76-
language: generic
77-
env:
78-
- MB_PYTHON_VERSION=3.8
79-
- MB_PYTHON_OSX_VER=10.9
80-
- NP_BUILD_DEP="1.17.3"
81-
- NP_TEST_DEP="1.17.3"
82-
- os: osx
83-
language: generic
84-
env:
85-
- MB_PYTHON_VERSION=3.9
86-
- MB_PYTHON_OSX_VER=10.9
87-
- NP_BUILD_DEP="1.19.4"
88-
- NP_TEST_DEP="1.19.4"
46+
# - os: linux
47+
# env:
48+
# - MB_PYTHON_VERSION=3.8
49+
# - PLAT=i686
50+
# - NP_BUILD_DEP="1.17.3"
51+
# - NP_TEST_DEP="1.17.3"
52+
# - os: linux
53+
# env:
54+
# - MB_PYTHON_VERSION=3.9
55+
# - NP_BUILD_DEP="1.19.4"
56+
# - NP_TEST_DEP="1.19.4"
57+
# - os: linux
58+
# env:
59+
# - MB_PYTHON_VERSION=3.9
60+
# - PLAT=i686
61+
# - NP_BUILD_DEP="1.19.4"
62+
# - NP_TEST_DEP="1.19.4"
63+
# - os: osx
64+
# language: generic
65+
# env:
66+
# - MB_PYTHON_VERSION=3.6
67+
# - MB_PYTHON_OSX_VER=10.9
68+
# - os: osx
69+
# language: generic
70+
# env:
71+
# - MB_PYTHON_VERSION=3.7
72+
# - MB_PYTHON_OSX_VER=10.9
73+
# - NP_BUILD_DEP="1.17.3"
74+
# - NP_TEST_DEP="1.17.3"
75+
# - os: osx
76+
# language: generic
77+
# env:
78+
# - MB_PYTHON_VERSION=3.8
79+
# - MB_PYTHON_OSX_VER=10.9
80+
# - NP_BUILD_DEP="1.17.3"
81+
# - NP_TEST_DEP="1.17.3"
82+
# - os: osx
83+
# language: generic
84+
# env:
85+
# - MB_PYTHON_VERSION=3.9
86+
# - MB_PYTHON_OSX_VER=10.9
87+
# - NP_BUILD_DEP="1.19.4"
88+
# - NP_TEST_DEP="1.19.4"
8989

9090
before_install:
9191
- BUILD_DEPENDS="numpy==$NP_BUILD_DEP Cython setuptools>=18.0"

config.sh

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ source h5py-wheels/config.sh
1212

1313
function build_libs {
1414
build_hdf5
15-
build_curl
15+
build_curl2
1616
if [ -z "$IS_OSX" ] && [ $MB_ML_VER -eq 1 ]; then
1717
export CFLAGS="-std=gnu99 -Wl,-strip-all"
1818
fi
@@ -28,3 +28,28 @@ function run_tests {
2828
cp ../netcdf4-python/test/* .
2929
python run_all.py
3030
}
31+
32+
function build_curl2 {
33+
if [ -e curl-stamp ]; then return; fi
34+
local flags="--prefix=$BUILD_PREFIX"
35+
if [ -n "$IS_OSX" ]; then
36+
flags="$flags --with-darwinssl"
37+
else # manylinux
38+
flags="$flags --with-ssl"
39+
# Install new Perl because OpenSSL configure scripts require > 5.10.0.
40+
curl -L https://install.perlbrew.pl | bash
41+
export PERLBREW_ROOT=/root/perl5/perlbrew
42+
source ${PERLBREW_ROOT}/etc/bashrc
43+
perlbrew install perl-5.16.0
44+
perlbrew use perl-5.16.0
45+
build_openssl
46+
fi
47+
fetch_unpack https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz
48+
(cd curl-${CURL_VERSION} \
49+
&& if [ -z "$IS_OSX" ]; then \
50+
LIBS=-ldl ./configure $flags; else \
51+
./configure $flags; fi\
52+
&& make -j4 \
53+
&& make install)
54+
touch curl-stamp
55+
}

0 commit comments

Comments
 (0)