Merge branch 'master' into release

thewtex · thewtex · commit 9d50c61aa74a · 2018-04-16T16:20:27.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,8 +73,8 @@ if(ITKPythonPackage_SUPERBUILD)
   include(ExternalProject)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
-  # ITK master 2017-12-19
-  set(ITK_GIT_TAG "e11bce2")
+  # ITK nightly-master 2018-04-13
+  set(ITK_GIT_TAG "87ef7db")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused
diff --git a/docs/Build_ITK_Module_Python_packages.rst b/docs/Build_ITK_Module_Python_packages.rst
@@ -109,7 +109,7 @@ Then, build the wheels::
 Windows
 -------
 
-First, install Microsoft Visual C++ Compiler for Python 2.7, Visual Studio 2015, Git, and CMake, which should be added to the system PATH environmental variable.
+First, install Microsoft Visual Studio 2015, Git, and CMake, which should be added to the system PATH environmental variable.
 
 Open a PowerShell terminal as Administrator, and install Python::
 
@@ -146,11 +146,6 @@ Next, create a `~/.pypirc` file with your login credentials::
 
 where `<your-username>` and `<your-password>` correspond to your PyPI account.
 
-If you have a `GPG signing key
-<https://help.github.com/articles/generating-a-new-gpg-key/>`_, sign the wheels::
-
-  for whl in dist/*.whl; do gpg --detach-sign -a $whl; done
-
 Then, upload wheels to the testing server::
 
   python -m pip install twine
diff --git a/docs/Build_ITK_Python_packages.rst b/docs/Build_ITK_Python_packages.rst
@@ -60,7 +60,7 @@ Then, build the wheels::
 Windows
 -------
 
-First, install Microsoft Visual C++ Compiler for Python 2.7, Visual Studio 2015, Git, and CMake, which should be added to the system PATH environmental variable.
+First, install Microsoft Visual Studio 2015, Git, and CMake, which should be added to the system PATH environmental variable.
 
 Open a PowerShell terminal as Administrator, and install Python::
 
@@ -81,7 +81,6 @@ In a PowerShell prompt::
 
 	    Mode                LastWriteTime         Length Name
 	    ----                -------------         ------ ----
-	    -a----         4/9/2017   5:21 PM       59435508 itk-4.11.0.dev20170407-cp27-cp27m-win_amd64.whl
 	    -a----         4/9/2017  11:14 PM       63274441 itk-4.11.0.dev20170407-cp35-cp35m-win_amd64.whl
 	    -a----        4/10/2017   2:08 AM       63257220 itk-4.11.0.dev20170407-cp36-cp36m-win_amd64.whl
 
diff --git a/itkVersion.py b/itkVersion.py
@@ -1,4 +1,4 @@
-VERSION = '4.13.0'
+VERSION = '5.0a01.dev20180413+16.g87ef7db'
 
 def get_versions():
     """Returns versions for the ITK Python package.
diff --git a/scripts/dockcross-manylinux-build-module-wheels.sh b/scripts/dockcross-manylinux-build-module-wheels.sh
@@ -22,7 +22,7 @@ script_dir=$(cd $(dirname $0) || exit 1; pwd)
 
 # Build wheels
 mkdir -p dist
-DOCKER_ARGS="-v $(pwd)/dist:/work/dist/ -v "$script_dir/..":/ITKPythonPackage -v $(pwd)/tools:/tools"
+DOCKER_ARGS="-v $(pwd)/dist:/work/dist/ -v $script_dir/..:/ITKPythonPackage -v $(pwd)/tools:/tools"
 /tmp/dockcross-manylinux-x64 \
   -a "$DOCKER_ARGS" \
   "/ITKPythonPackage/scripts/internal/manylinux-build-module-wheels.sh" "$@"
diff --git a/scripts/dockcross-manylinux-build-tarball.sh b/scripts/dockcross-manylinux-build-tarball.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# This script creates a tarball of the ITK Python package build tree. It is
+# downloaded by the external module build scripts and used to build their
+# Python package on GitHub CI services.
+
+cd /home/kitware/Packaging
+tar -c --to-stdout \
+  ITKPythonPackage/ITK-* \
+  ITKPythonPackage/standalone-* \
+  ITKPythonPackage/scripts > ITKPythonBuilds-linux.tar
+/home/kitware/Support/zstd-build/programs/zstd -f \
+  ./ITKPythonBuilds-linux.tar \
+  -o ./ITKPythonBuilds-linux.tar.zst
diff --git a/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh b/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh
@@ -7,7 +7,7 @@ wget -L https://data.kitware.com/api/v1/file/592dd8068d777f16d01e1a92/download -
 gunzip -d zstd-1.2.0-linux.tar.gz
 tar xf zstd-1.2.0-linux.tar
 
-curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/v4.12.0.post1/ITKPythonBuilds-linux.tar.zst -O
+curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/v4.13.0/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
 
diff --git a/scripts/internal/windows_build_common.py b/scripts/internal/windows_build_common.py
@@ -3,7 +3,7 @@
 from subprocess import check_call
 import os
 
-DEFAULT_PY_ENVS = ["27-x64", "35-x64", "36-x64"]
+DEFAULT_PY_ENVS = ["35-x64", "36-x64"]
 
 SCRIPT_DIR = os.path.dirname(__file__)
 ROOT_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "..", ".."))
@@ -32,7 +32,7 @@ def venv_paths(python_version):
     pip = os.path.join(venv_dir, "Scripts", "pip.exe")
 
     ninja_executable = os.path.join(
-        ROOT_DIR, "venv-27-x64", "Scripts", "ninja.exe")
+        ROOT_DIR, "venv-35-x64", "Scripts", "ninja.exe")
     print("NINJA_EXECUTABLE:%s" % ninja_executable)
 
     # Update PATH
diff --git a/scripts/macpython-build-module-wheels.sh b/scripts/macpython-build-module-wheels.sh
@@ -48,13 +48,13 @@ for VENV in "${VENVS[@]}"; do
     ${PYTHON_EXECUTABLE} -m pip install --no-cache ninja
     NINJA_EXECUTABLE=${VENV}/bin/ninja
     itk_build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
-    ${PYTHON_EXECUTABLE} setup.py bdist_wheel --build-type MinSizeRel --plat-name macosx-10.6-x86_64 -G Ninja -- \
+    ${PYTHON_EXECUTABLE} setup.py bdist_wheel --build-type MinSizeRel --plat-name macosx-10.9-x86_64 -G Ninja -- \
       -DCMAKE_MAKE_PROGRAM:FILEPATH=${NINJA_EXECUTABLE} \
       -DITK_DIR:PATH=${itk_build_path} \
       -DITK_USE_SYSTEM_SWIG:BOOL=ON \
       -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
       -DSWIG_EXECUTABLE:FILEPATH=${itk_build_path}/Wrapping/Generators/SwigInterface/swig/bin/swig \
-      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 \
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9 \
       -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 \
       -DBUILD_TESTING:BOOL=OFF \
       -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
diff --git a/scripts/macpython-build-tarball.sh b/scripts/macpython-build-tarball.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# This script creates a tarball of the ITK Python package build tree. It is
+# downloaded by the external module build scripts and used to build their
+# Python package on GitHub CI services.
+
+pushd /Users/kitware/Dashboards/ITK > /dev/null
+tar -cf ITKPythonBuilds-macosx.tar \
+  ITKPythonPackage/ITK-* \
+  ITKPythonPackage/standalone-* \
+  ITKPythonPackage/venvs \
+  ITKPythonPackageRequiredExtractionDir.txt \
+  ITKPythonPackage/scripts
+/usr/local/bin/zstd -f \
+  ./ITKPythonBuilds-macosx.tar \
+  -o ./ITKPythonBuilds-macosx.tar.zst
+popd > /dev/null
diff --git a/scripts/macpython-build-wheels.sh b/scripts/macpython-build-wheels.sh
@@ -75,8 +75,8 @@ for VENV in "${VENVS[@]}"; do
     ${PYTHON_EXECUTABLE} -m pip install --upgrade -r ${SCRIPT_DIR}/../requirements-dev.txt
 
     build_type="MinSizeRel"
-    plat_name="macosx-10.6-x86_64"
-    osx_target="10.6"
+    plat_name="macosx-10.9-x86_64"
+    osx_target="10.9"
     source_path=${SCRIPT_DIR}/../standalone-build/ITK-source
     build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
     SETUP_PY_CONFIGURE="${script_dir}/setup_py_configure.py"
diff --git a/scripts/macpython-download-cache-and-build-module-wheels.sh b/scripts/macpython-download-cache-and-build-module-wheels.sh
@@ -5,7 +5,7 @@
 
 brew update
 brew install zstd aria2 gnu-tar doxygen
-aria2c -c --file-allocation=none -o ITKPythonBuilds-macosx.tar.zst -s 10 -x 10 https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v4.12.0.post1}/ITKPythonBuilds-macosx.tar.zst
+aria2c -c --file-allocation=none -o ITKPythonBuilds-macosx.tar.zst -s 10 -x 10 https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v4.13.0}/ITKPythonBuilds-macosx.tar.zst
 unzstd ITKPythonBuilds-macosx.tar.zst -o ITKPythonBuilds-macosx.tar
 PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"
 tar xf ITKPythonBuilds-macosx.tar --checkpoint=10000 --checkpoint-action=dot
diff --git a/scripts/windows-build-tarball.ps1 b/scripts/windows-build-tarball.ps1
@@ -0,0 +1,6 @@
+# This script creates a tarball of the ITK Python package build tree. It is
+# downloaded by the external module build scripts and used to build their
+# Python package on GitHub CI services.
+
+cd C:\P\
+C:\7-Zip\7z.exe a -r 'C:\P\ITKPythonBuilds-windows.zip' -w 'C:\P\IPP' -mem=AES256
diff --git a/scripts/windows-download-cache-and-build-module-wheels.ps1 b/scripts/windows-download-cache-and-build-module-wheels.ps1
@@ -2,8 +2,11 @@ trap { Write-Error $_; Exit 1 }
 
 set-alias sz "$env:ProgramFiles\7-Zip\7z.exe"  
 iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/scikit-build/scikit-ci-addons/master/windows/install-python.ps1'))
-Invoke-WebRequest -Uri "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/v4.12.0.post1/ITKPythonBuilds-windows.zip" -OutFile "ITKPythonBuilds-windows.zip"
+Invoke-WebRequest -Uri "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/v4.13.0/ITKPythonBuilds-windows.zip" -OutFile "ITKPythonBuilds-windows.zip"
 sz x ITKPythonBuilds-windows.zip -oC:\P -aoa -r
 Invoke-WebRequest -Uri "http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.11.windows.bin.zip" -OutFile "doxygen-1.8.11.windows.bin.zip"
 sz x doxygen-1.8.11.windows.bin.zip -oC:\P\doxygen -aoa -r
-C:\Python27-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py
+Invoke-WebRequest -Uri "https://midas3.kitware.com/midas/download/bitstream/462235/grep-win.zip" -OutFile "grep-win.zip"
+sz x grep-win.zip -oC:\P\grep -aoa -r
+$env:Path += ";C:\P\grep"
+C:\Python35-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py
diff --git a/scripts/windows_build_wheels.py b/scripts/windows_build_wheels.py
@@ -226,14 +226,13 @@ def test_wheels(single_wheel=False):
 def build_wheels(py_envs=DEFAULT_PY_ENVS, single_wheel=False,
                  cleanup=False, wheel_names=None):
 
-    prepare_build_env("27-x64")
     prepare_build_env("35-x64")
     prepare_build_env("36-x64")
 
     with push_dir(directory=STANDALONE_DIR, make_directory=True):
 
         cmake_executable = "cmake.exe"
-        tools_venv = os.path.join(ROOT_DIR, "venv-27-x64")
+        tools_venv = os.path.join(ROOT_DIR, "venv-35-x64")
         pip_install(tools_venv, "ninja")
         ninja_executable = os.path.join(tools_venv, "Scripts", "ninja.exe")
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = '4.13.0'`
	`1`	`+VERSION = '5.0a01.dev20180413+16.g87ef7db'`
`2`	`2`
`3`	`3`	`def get_versions():`
`4`	`4`	`"""Returns versions for the ITK Python package.`