Merge pull request multi-build#262 from mattip/abi_tag

MRG: fixes to allow Python 3.8 RC installs

Remove `m` from ABI tag.

Look for RC when installing Python 3.8 from macOS download.

Author: matthew-brett

.travis.yml

@@ -78,6 +78,12 @@ matrix:
         - PYTHON_VERSION=3.7
         - VENV=venv
         - USE_CCACHE=1
+    - os: osx
+      env:
+        - PYTHON_VERSION=3.8
+        - VENV=venv
+        - MB_PYTHON_OSX_VER=10.9
+        - MB_ML_VER=2010
     - os: osx
       env:
         - PYTHON_VERSION=pypy-4.0
@@ -143,6 +149,12 @@ matrix:
       osx_image: xcode10
       env:
         - PYTHON_VERSION=3.7
+    - os: osx
+      osx_image: xcode10
+      env:
+        - PYTHON_VERSION=3.8
+        - MB_PYTHON_OSX_VER=10.9
+        - MB_ML_VER=2010
     - os: osx
       osx_image: xcode10.1
       env:

manylinux_utils.sh

@@ -19,8 +19,14 @@ function cpython_path {
     #
     # For back-compatibility "u" as u_width also means "32"
     local py_ver="${1:-2.7}"
+    local abi_suff=m
     local u_width="${2:-${UNICODE_WIDTH}}"
     local u_suff=u
+    # Python 3.8 and up no longer uses the PYMALLOC 'm' suffix
+    # https://github.com/pypa/wheel/pull/303
+    if [ $(lex_ver $py_ver) -ge $(lex_ver 3.8) ]; then
+        abi_suff=""
+    fi
     # Back-compatibility
     if [ "$u_width" == "u" ]; then u_width=32; fi
     # For Python >= 3.4, "u" suffix not meaningful
@@ -32,7 +38,7 @@ function cpython_path {
         exit 1
     fi
     local no_dots=$(echo $py_ver | tr -d .)
-    echo "/opt/python/cp${no_dots}-cp${no_dots}m${u_suff}"
+    echo "/opt/python/cp${no_dots}-cp${no_dots}$abi_suff${u_suff}"
 }
 
 function repair_wheelhouse {

osx_utils.sh

@@ -21,6 +21,7 @@ LATEST_2p7=2.7.16
 LATEST_3p5=3.5.4
 LATEST_3p6=3.6.8
 LATEST_3p7=3.7.4
+LATEST_3p8=3.8.0rc1
 
 
 function check_python {
@@ -83,6 +84,8 @@ function fill_pyver {
         echo $LATEST_3p6
     elif [ $ver == "3.5" ]; then
         echo $LATEST_3p5
+    elif [ $ver == "3.8" ]; then
+        echo $LATEST_3p8
     else
         echo "Can't fill version $ver" 1>&2
         exit 1