Commit 58723a2b authored by mattip's avatar mattip
Browse files

fixes from review

parent cba91d9e
...@@ -42,7 +42,7 @@ The Travis CI scripts are designed to build *and test*: ...@@ -42,7 +42,7 @@ The Travis CI scripts are designed to build *and test*:
* 64-bit macOS wheels built for macOS 10.9+ * 64-bit macOS wheels built for macOS 10.9+
* 64/32-bit macOS wheels built for macOS 10.6+ * 64/32-bit macOS wheels built for macOS 10.6+
* 64-bit ``manylinuxX_x86_64`` wheels, both narrow and wide Unicode builds, * 64-bit ``manylinuxX_x86_64`` wheels, both narrow and wide Unicode builds,
where `X` is any valid Manylinux version, such as `1`, or `2010` where `X` is any valid Manylinux version: `1`, `2010`, `2014` or `_2_24`.
* 32-bit ``manylinuxX_i686`` wheels, both narrow and wide Unicode builds * 32-bit ``manylinuxX_i686`` wheels, both narrow and wide Unicode builds
You can currently build and test against Pythons 2.7, 3.5, 3.6, 3.7, 3.8 and 3.9 You can currently build and test against Pythons 2.7, 3.5, 3.6, 3.7, 3.8 and 3.9
......
...@@ -27,7 +27,8 @@ UNICODE_WIDTH=${UNICODE_WIDTH:-32} ...@@ -27,7 +27,8 @@ UNICODE_WIDTH=${UNICODE_WIDTH:-32}
if [ $(uname) == "Darwin" ]; then if [ $(uname) == "Darwin" ]; then
IS_MACOS=1; IS_OSX=1; IS_MACOS=1; IS_OSX=1;
else else
# In the manylinux_2_24 image, based on Debian9, python2 is not installed # In the manylinux_2_24 image, based on Debian9, "python" is not installed
# so link in something for the various system calls before PYTHON_EXE is set
which python || export PATH=/opt/python/cp39-cp39/bin:$PATH which python || export PATH=/opt/python/cp39-cp39/bin:$PATH
fi fi
...@@ -205,12 +206,15 @@ function untar { ...@@ -205,12 +206,15 @@ function untar {
} }
function install_rsync { function install_rsync {
# install rsync via package manager
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then
# macOS. The colon in the next line is the null command # macOS. The colon in the next line is the null command
: :
elif [[ $MB_ML_VER == "_2_24" ]]; then elif [[ $MB_ML_VER == "_2_24" ]]; then
# debian:9 based distro
[[ $(type -P rsync) ]] || apt-get install -y rsync [[ $(type -P rsync) ]] || apt-get install -y rsync
else else
# centos based distro
[[ $(type -P rsync) ]] || yum_install rsync [[ $(type -P rsync) ]] || yum_install rsync
fi fi
} }
......
...@@ -47,24 +47,19 @@ else ...@@ -47,24 +47,19 @@ else
export CFLAGS="${CFLAGS:-$STRIP_FLAGS}" export CFLAGS="${CFLAGS:-$STRIP_FLAGS}"
export CXXFLAGS="${CXXFLAGS:-$STRIP_FLAGS}" export CXXFLAGS="${CXXFLAGS:-$STRIP_FLAGS}"
export FFLAGS="${FFLAGS:-$STRIP_FLAGS}" export FFLAGS="${FFLAGS:-$STRIP_FLAGS}"
if [[ $MB_ML_VER == "1" ]]; then if [[ $MB_ML_VER == "_2_24" ]]; then
if [ "${MB_PYTHON_VERSION:0:4}" == "pypy" ]; then # This is the first opportunity to distinguish between manylinux's
yum install -y libtool wget
else
yum install -y libtool
fi
elif [[ $MB_ML_VER == "_2_24" ]]; then
apt update apt update
if [ ! -d /usr/local/man ]; then
# Fix problem with manylinux_2_24 image
# /usr/local/man is a broken symlink
rm /usr/local/man
ln -s /usr/share/man /usr/local/man
fi
if [ "${MB_PYTHON_VERSION:0:4}" == "pypy" ]; then if [ "${MB_PYTHON_VERSION:0:4}" == "pypy" ]; then
# debian:9 based distro
apt install -y wget apt install -y wget
fi fi
elif [[ $MB_ML_VER == "1" ]]; then
# Need libtool, and for pypy need wget
# centos based distro
yum install -y libtool wget
elif [ "${MB_PYTHON_VERSION:0:4}" == "pypy" ]; then elif [ "${MB_PYTHON_VERSION:0:4}" == "pypy" ]; then
# centos based distro
yum install -y wget yum install -y wget
fi fi
fi fi
......
...@@ -134,8 +134,10 @@ function build_zlib { ...@@ -134,8 +134,10 @@ function build_zlib {
if [ -n "$IS_MACOS" ]; then return; fi # OSX has zlib already if [ -n "$IS_MACOS" ]; then return; fi # OSX has zlib already
if [ -e zlib-stamp ]; then return; fi if [ -e zlib-stamp ]; then return; fi
if [[ $MB_ML_VER == "_2_24" ]]; then if [[ $MB_ML_VER == "_2_24" ]]; then
# debian:9 based distro
apt-get install -y zlib1g-dev apt-get install -y zlib1g-dev
else else
#centos based distro
yum_install zlib-devel yum_install zlib-devel
fi fi
touch zlib-stamp touch zlib-stamp
...@@ -185,11 +187,13 @@ function get_modern_cmake { ...@@ -185,11 +187,13 @@ function get_modern_cmake {
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then
brew install cmake > /dev/null brew install cmake > /dev/null
elif [[ $MB_ML_VER == "_2_24" ]]; then elif [[ $MB_ML_VER == "_2_24" ]]; then
# debian:9 based distro
apt-get install -y cmake apt-get install -y cmake
else else
if [ "`yum search cmake | grep ^cmake28\.`" ]; then if [ "`yum search cmake | grep ^cmake28\.`" ]; then
cmake=cmake28 cmake=cmake28
fi fi
# centos based distro
yum_install $cmake > /dev/null yum_install $cmake > /dev/null
fi fi
echo $cmake echo $cmake
...@@ -403,8 +407,10 @@ function build_suitesparse { ...@@ -403,8 +407,10 @@ function build_suitesparse {
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then
brew install suite-sparse > /dev/null brew install suite-sparse > /dev/null
elif [[ $MB_ML_VER == "_2_24" ]]; then elif [[ $MB_ML_VER == "_2_24" ]]; then
# debian:9 based distro
apt-get install -y libsuitesparse-dev > /dev/null apt-get install -y libsuitesparse-dev > /dev/null
else else
# centos based distro
yum_install suitesparse-devel > /dev/null yum_install suitesparse-devel > /dev/null
fi fi
touch suitesparse-stamp touch suitesparse-stamp
......
...@@ -45,8 +45,10 @@ function activate_ccache { ...@@ -45,8 +45,10 @@ function activate_ccache {
# Now install ccache # Now install ccache
if [[ $MB_ML_VER == "_2_24" ]]; then if [[ $MB_ML_VER == "_2_24" ]]; then
# debian:9 based distro
suppress apt-get install -y ccache suppress apt-get install -y ccache
else else
# centos based distro
suppress yum_install ccache suppress yum_install ccache
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment