From 17d991bc144078b6eb067244399769ce22643aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20Niesiob=C4=99dzki?= <osm@vink.pl>
Date: Fri, 14 Feb 2020 11:20:43 +0000
Subject: [PATCH] Properly set manylinux2010 variable and use stock cmake

---
 .travis.yml |  7 ++-----
 build.sh    |  4 +++-
 config.sh   | 28 +---------------------------
 env_vars.sh |  1 -
 4 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4c413d..7f128a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/build.sh b/build.sh
index f5f07b0..791394c 100644
--- a/build.sh
+++ b/build.sh
@@ -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
diff --git a/config.sh b/config.sh
index a65457c..54d787b 100644
--- a/config.sh
+++ b/config.sh
@@ -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.
@@ -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 
diff --git a/env_vars.sh b/env_vars.sh
index cd5ebb2..3feaddb 100644
--- a/env_vars.sh
+++ b/env_vars.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
 export LIBOSMIUM_PREFIX=/io/libosmium
-export MB_ML_VER=2010