Merge branch 'python-38'

Author: thewtex

scripts/dockcross-manylinux-build-module-wheels.sh

@@ -9,13 +9,13 @@
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp35
 
 # Pull dockcross manylinux images
-docker pull dockcross/manylinux-x64
-#docker pull dockcross/manylinux-x86
+docker pull dockcross/manylinux1-x64
+#docker pull dockcross/manylinux1-x86
 
 # Generate dockcross scripts
-docker run dockcross/manylinux-x64 > /tmp/dockcross-manylinux-x64
+docker run dockcross/manylinux1-x64 > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
-#docker run dockcross/manylinux-x86 > /tmp/dockcross-manylinux-x86
+#docker run dockcross/manylinux1-x86 > /tmp/dockcross-manylinux-x86
 #chmod u+x /tmp/dockcross-manylinux-x86
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)

scripts/dockcross-manylinux-build-wheels.sh

@@ -8,13 +8,13 @@
 #   scripts/dockcross-manylinux-build-wheels.sh cp35
 
 # Pull dockcross manylinux images
-docker pull dockcross/manylinux-x64
-#docker pull dockcross/manylinux-x86
+docker pull dockcross/manylinux1-x64
+#docker pull dockcross/manylinux1-x86
 
 # Generate dockcross scripts
-docker run dockcross/manylinux-x64 > /tmp/dockcross-manylinux-x64
+docker run dockcross/manylinux1-x64 > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
-#docker run dockcross/manylinux-x86 > /tmp/dockcross-manylinux-x86
+#docker run dockcross/manylinux1-x86 > /tmp/dockcross-manylinux-x86
 #chmod u+x /tmp/dockcross-manylinux-x86
 
 script_dir=$(cd $(dirname $0) || exit 1; pwd)

scripts/internal/manylinux-build-common.sh

@@ -10,7 +10,7 @@ if [[ $# -eq 0 ]]; then
   PYBIN=(/opt/python/*/bin)
   PYBINARIES=()
   for version in "${PYBIN[@]}"; do
-    if [[ ${version} == *"cp35"* || ${version} == *"cp36"* || ${version} == *"cp37"* ]]; then
+    if [[  ${version} == *"cp35"* || ${version} == *"cp36"* || ${version} == *"cp37"* || ${version} == *"cp38"*  ]]; then
       PYBINARIES+=(${version})
     fi
   done

scripts/internal/windows_build_common.py

@@ -3,7 +3,7 @@
 from subprocess import check_call
 import os
 
-DEFAULT_PY_ENVS = ["35-x64", "36-x64", "37-x64"]
+DEFAULT_PY_ENVS = ["35-x64", "36-x64", "37-x64", "38-x64"]
 
 SCRIPT_DIR = os.path.dirname(__file__)
 ROOT_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "..", ".."))

scripts/macpython-build-wheels.sh

@@ -99,7 +99,6 @@ for VENV in "${VENVS[@]}"; do
         -DITK_BINARY_DIR:PATH=${build_path} \
         -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
         -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 \
-        -DCMAKE_OSX_SYSROOT:STRING=macosx10.13 \
         -DITK_WRAP_unsigned_short:BOOL=ON \
         -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
         -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
@@ -125,7 +124,6 @@ for VENV in "${VENVS[@]}"; do
           -DBUILD_TESTING:BOOL=OFF \
           -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
           -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 \
-          -DCMAKE_OSX_SYSROOT:STRING=macosx10.13 \
           -DITK_WRAP_unsigned_short:BOOL=ON \
           -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
           -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
@@ -153,7 +151,6 @@ for VENV in "${VENVS[@]}"; do
           -DITK_BINARY_DIR:PATH=${build_path} \
           -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
           -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 \
-          -DCMAKE_OSX_SYSROOT:STRING=macosx10.13 \
           -DITKPythonPackage_ITK_BINARY_REUSE:BOOL=ON \
           -DITKPythonPackage_WHEEL_NAME:STRING=${wheel_name} \
           -DITK_WRAP_unsigned_short:BOOL=ON \

scripts/macpython-download-cache-and-build-module-wheels.sh

@@ -6,12 +6,6 @@
 brew update
 brew install zstd aria2 gnu-tar doxygen
 brew upgrade cmake
-# The Azure systems current do not have the 10.13 SDK, required by the
-# ITKPythonBuilds
-SDK_PATH='/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk'
-if test ! -e $SDK_PATH; then
-  sudo ln -s /Applications/Xcode_9.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
-fi
 aria2c -c --file-allocation=none -o ITKPythonBuilds-macosx.tar.zst -s 10 -x 10 https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0.1}/ITKPythonBuilds-macosx.tar.zst
 unzstd ITKPythonBuilds-macosx.tar.zst -o ITKPythonBuilds-macosx.tar
 PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"