Merge branch 'master' into build-O2

Author: thewtex

CMakeLists.txt

@@ -73,8 +73,9 @@ if(ITKPythonPackage_SUPERBUILD)
   include(ExternalProject)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
-  # ITK release 2020-04-01
-  set(ITK_GIT_TAG "ce5cf9165190a8e3ebf620ffa467320912576134")
+
+  # ITK nightly-master 2020-05-05
+  set(ITK_GIT_TAG "cd38ccce01")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused

itkVersion.py

@@ -1,4 +1,4 @@
-VERSION = '5.1rc3'
+VERSION = '5.1.0.dev20200505+19.gcd38ccce01'
 
 def get_versions():
     """Returns versions for the ITK Python package.

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

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

scripts/dockcross-manylinux-build-wheels.sh

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

scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh

@@ -25,17 +25,18 @@ if [[ ! -f ./zstd-1.2.0-linux/bin/unzstd ]]; then
 fi
 
 if [[ ! -f ITKPythonBuilds-linux.tar.zst ]]; then
-  curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.1rc02}/ITKPythonBuilds-linux.tar.zst -O
-  ./zstd-1.2.0-linux/bin/unzstd ./ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar
-  tar xf ITKPythonBuilds-linux.tar
+  curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.1.0}/ITKPythonBuilds-linux.tar.zst -O
 fi
 if [[ ! -f ./ITKPythonBuilds-linux.tar.zst ]]; then
   echo "ERROR: can not find required binary './ITKPythonBuilds-linux.tar.zst'"
   exit 255
 fi
+./zstd-1.2.0-linux/bin/unzstd ./ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar
+tar xf ITKPythonBuilds-linux.tar
+rm ITKPythonBuilds-linux.tar
 if [[ ! -f ./ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh ]]; then
   echo "ERROR: can not find required binary './ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh'"
   exit 255
 fi
 
-./ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh
+./ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh "$@"