Skip to content
This repository has been archived by the owner on Dec 1, 2023. It is now read-only.

Commit

Permalink
Properly set manylinux2010 variable and use stock cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
wiktorn committed Feb 14, 2020
1 parent e3da867 commit 17d991b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 34 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@ env:
- PLAT=x86_64
- UNICODE_WIDTH=32
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
# Following generated with
# travis encrypt -r your-org/your-project-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
# This is for Rackspace uploads. Contact Matthew Brett, or the
# scikit-learn team, for # permission (and the API key) to upload to
# the Rackspace account used here, or use your own account.
# manylinux version to build (1, 2010 or 2014)
- MB_ML_VER=2010

language: python
# The travis Python version is unrelated to the version we build and test
Expand Down
4 changes: 3 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ else
fi

# for p in "2.7" "3.4" "3.5" "3.6" ; do
for p in "3.4" "3.5" "3.6" "3.7" "2.7" ; do
for p in "3.4" "3.5" "3.6" "3.7" "3.8" "2.7" ; do
export MB_PYTHON_VERSION="${p}"
find . -maxdepth 1 -type f -name '*-stamp' -delete

source multibuild/common_utils.sh
source multibuild/travis_steps.sh
before_install
Expand Down
28 changes: 1 addition & 27 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
# Define custom utilities
# Test for OSX with [ -n "$IS_OSX" ]

CMAKE_BIN_URL_64=https://cmake.org/files/v3.6/cmake-3.6.3-Linux-x86_64.sh
CMAKE_BIN_URL_32=https://cmake.org/files/v3.6/cmake-3.6.3-Linux-i386.sh
ZLIB_SOURCE=https://zlib.net/zlib-1.2.11.tar.gz

function pre_build {
# Any stuff that you need to do before you start building the wheels
# Runs in the root directory of this repository.
Expand All @@ -18,30 +14,8 @@ function pre_build {
brew update
brew install google-sparsehash || true
else
yum install -y sparsehash-devel
fi

####
# CMake
####
if [ -n "$IS_OSX" ] ; then
# nothing?
echo -n
else
if [ "x${PLAT}" == "xi686" ] ; then
curl -o /tmp/cmake.sh "${CMAKE_BIN_URL_32}"
else
curl -o /tmp/cmake.sh "${CMAKE_BIN_URL_64}"
fi
(
cd /
echo $'y\nn' | bash /tmp/cmake.sh
)
cmake --version
yum install -y sparsehash-devel expat-devel
fi
####
# End of CMake
####

####
# BOOST
Expand Down
1 change: 0 additions & 1 deletion env_vars.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env bash

export LIBOSMIUM_PREFIX=/io/libosmium
export MB_ML_VER=2010

0 comments on commit 17d991b

Please sign in to comment.