Merge branch 'master' into release

thewtex · thewtex · commit 1232353080ed · 2018-09-06T19:02:18.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,9 @@ libpython-not-needed-symbols-exported-by-interpreter
 # C extensions
 *.so
 
+# macOS
+.DS_Store
+
 # Packages
 *.egg
 *.eggs
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 nightly-master 2018-05-25
-  set(ITK_GIT_TAG "v5.0a02")
+  # ITK nightly-master 2018-09-05
+  set(ITK_GIT_TAG "f5e254b")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused
@@ -423,7 +423,7 @@ else()
       set(wheel_group_display ${wheel_group})
 
       # XXX Hard-coded dispatch
-      if(module STREQUAL "BridgeNumPy")
+      if(module STREQUAL "ITKBridgeNumPy")
         set(new_wheel_group "Core")
         set(wheel_group_display "${new_wheel_group} (was ${wheel_group})")
         set(wheel_group ${new_wheel_group})
diff --git a/docs/index.rst b/docs/index.rst
@@ -14,8 +14,8 @@ To install the stable ITK Python package::
 The Python packages are built daily. To install the latest build from the ITK
 Git *master* branch::
 
-  python -m pip install --upgrade pip
-  python -m pip install itk --no-index \
+  python -m pip install --upgrade pip numpy
+  python -m pip install itk --upgrade --no-index \
     -f https://github.com/InsightSoftwareConsortium/ITKPythonPackage/releases/tag/latest
 
 
diff --git a/itkVersion.py b/itkVersion.py
@@ -1,4 +1,4 @@
-VERSION = '5.0a2'
+VERSION = '5.0a02.dev20180905+392.gf5e254b'
 
 def get_versions():
     """Returns versions for the ITK Python package.
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/${ITK_PACKAGE_VERSION:=v5.0a01}/ITKPythonBuilds-linux.tar.zst -O
+curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0a02}/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/manylinux-build-common.sh b/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} == *"cp27"* || ${version} == *"cp35"* || ${version} == *"cp36"* ]]; then
+    if [[ ${version} == *"cp27"* || ${version} == *"cp35"* || ${version} == *"cp36"* || ${version} == *"cp37"* ]]; then
       PYBINARIES+=(${version})
     fi
   done
diff --git a/scripts/internal/manylinux-build-wheels.sh b/scripts/internal/manylinux-build-wheels.sh
@@ -28,7 +28,7 @@ SINGLE_WHEEL=0
 
 # Compile wheels re-using standalone project and archive cache
 for PYBIN in "${PYBINARIES[@]}"; do
-    PYTHON_EXECUTABLE=${PYBIN}/python
+    export PYTHON_EXECUTABLE=${PYBIN}/python
     PYTHON_INCLUDE_DIR=$( find -L ${PYBIN}/../include/ -name Python.h -exec dirname {} \; )
 
     echo ""
@@ -43,6 +43,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
     source_path=/work/standalone-${ARCH}-build/ITK-source
     build_path=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux1_${ARCH}
     SETUP_PY_CONFIGURE="${script_dir}/../setup_py_configure.py"
+    SKBUILD_CMAKE_INSTALL_PREFIX=$(${PYTHON_EXECUTABLE} -c "from skbuild.constants import CMAKE_INSTALL_DIR; print(CMAKE_INSTALL_DIR)")
 
     # Clean up previous invocations
     rm -rf ${build_path}
@@ -93,7 +94,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
           -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
           -DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=ON \
           -DITK_WRAP_unsigned_short:BOOL=ON \
-          -DPY_SITE_PACKAGES_PATH:PATH=${script_dir}/../../_skbuild/cmake-install \
+          -DPY_SITE_PACKAGES_PATH:PATH="." \
           -DITK_LEGACY_SILENT:BOOL=ON \
           -DITK_WRAP_PYTHON:BOOL=ON \
           -DITK_WRAP_PYTHON_LEGACY:BOOL=OFF \
@@ -143,8 +144,8 @@ done
 
 # Install packages and test
 for PYBIN in "${PYBINARIES[@]}"; do
-    ${PYBIN}/pip install numpy
-    ${PYBIN}/pip install itk --no-cache-dir --no-index -f /work/dist
+    ${PYBIN}/pip install --user numpy
+    ${PYBIN}/pip install itk --user --no-cache-dir --no-index -f /work/dist
     (cd $HOME && ${PYBIN}/python -c 'from itk import ITKCommon;')
     (cd $HOME && ${PYBIN}/python -c 'import itk; image = itk.Image[itk.UC, 2].New()')
     (cd $HOME && ${PYBIN}/python -c 'import itkConfig; itkConfig.LazyLoading = False; import itk;')
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 = ["35-x64", "36-x64"]
+DEFAULT_PY_ENVS = ["35-x64", "36-x64", "37-x64"]
 
 SCRIPT_DIR = os.path.dirname(__file__)
 ROOT_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "..", ".."))
diff --git a/scripts/macpython-build-wheels.sh b/scripts/macpython-build-wheels.sh
@@ -63,7 +63,7 @@ SINGLE_WHEEL=0
 # Compile wheels re-using standalone project and archive cache
 for VENV in "${VENVS[@]}"; do
     py_mm=$(basename ${VENV})
-    PYTHON_EXECUTABLE=${VENV}/bin/python
+    export PYTHON_EXECUTABLE=${VENV}/bin/python
     PYTHON_INCLUDE_DIR=$( find -L ${MACPYTHON_PY_PREFIX}/${py_mm}/include -name Python.h -exec dirname {} \; )
 
     echo ""
@@ -130,7 +130,7 @@ for VENV in "${VENVS[@]}"; do
           -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
           -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
           -DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=ON \
-          -DPY_SITE_PACKAGES_PATH:PATH=${SCRIPT_DIR}/../_skbuild/cmake-install \
+          "-DPY_SITE_PACKAGES_PATH:PATH=." \
           -DITK_LEGACY_SILENT:BOOL=ON \
           -DITK_WRAP_PYTHON:BOOL=ON \
           -DITK_WRAP_PYTHON_LEGACY:BOOL=OFF \
diff --git a/scripts/macpython-download-cache-and-build-module-wheels.sh b/scripts/macpython-download-cache-and-build-module-wheels.sh
@@ -6,7 +6,7 @@
 brew update
 brew install zstd aria2 gnu-tar doxygen
 brew upgrade cmake
-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.0a01}/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:=v5.0a02}/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/macpython-install-python.sh b/scripts/macpython-install-python.sh
@@ -96,6 +96,8 @@ function fill_pyver {
         echo $LATEST_27
     elif [ $ver == 3 ] || [ $ver == "3.6" ]; then
         echo $LATEST_36
+    elif [ $ver == 3 ] || [ $ver == "3.7" ]; then
+        echo $LATEST_37
     elif [ $ver == "3.5" ]; then
         echo $LATEST_35
     elif [ $ver == "3.4" ]; then
@@ -201,9 +203,10 @@ sudo rm -rf ${MACPYTHON_FRAMEWORK}
 LATEST_27=2.7.14
 LATEST_34=3.4.7
 LATEST_35=3.5.4
-LATEST_36=3.6.5
+LATEST_36=3.6.6
+LATEST_37=3.7.0
 
-for pyversion in $LATEST_27 $LATEST_35 $LATEST_36; do
+for pyversion in $LATEST_27 $LATEST_35 $LATEST_36 $LATEST_37; do
   install_macpython $pyversion
   install_pip
   install_virtualenv
diff --git a/scripts/setup_py_configure.py b/scripts/setup_py_configure.py
@@ -205,19 +205,22 @@ def get_wheel_dependencies():
     regex_group_depends = \
         r'set\s*\(\s*ITK\_GROUP\_([a-zA-Z0-9\_\-]+)\_DEPENDS\s*([a-zA-Z0-9\_\-\s]*)\s*'  # noqa: E501
     pattern = re.compile(regex_group_depends)
+    sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    from itkVersion import get_versions
+    version = get_versions()['package-version']
     with open(os.path.join(SCRIPT_DIR, "..", "CMakeLists.txt"), 'r') as file_:
         for line in file_.readlines():
             match = re.search(pattern, line)
             if not match:
                 continue
             wheel = from_group_to_wheel(match.group(1))
             _wheel_depends = [
-                from_group_to_wheel(group)
+                from_group_to_wheel(group) + '>=' + version
                 for group in match.group(2).split()
                 ]
             all_depends[wheel] = _wheel_depends
     all_depends['itk-meta'] = [
-        wheel_name for wheel_name in get_wheel_names()
+        wheel_name + '>=' + version for wheel_name in get_wheel_names()
         if wheel_name != 'itk-meta'
         ]
     all_depends['itk-meta'].append('numpy')
diff --git a/scripts/windows-build-tarball.ps1 b/scripts/windows-build-tarball.ps1
@@ -3,4 +3,5 @@
 # Python package on GitHub CI services.
 
 cd C:\P\
+Remove-Item IPP\dist\*
 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,7 +2,7 @@ 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'))
-if (-not (Test-Path env:ITK_PACKAGE_VERSION)) { $env:ITK_PACKAGE_VERSION = 'v5.0a01' }
+if (-not (Test-Path env:ITK_PACKAGE_VERSION)) { $env:ITK_PACKAGE_VERSION = 'v5.0a02' }
 Invoke-WebRequest -Uri "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/$env:ITK_PACKAGE_VERSION/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"
diff --git a/scripts/windows_build_wheels.py b/scripts/windows_build_wheels.py
@@ -74,8 +74,6 @@ def build_wrapped_itk(
         script_file.close()
         os.remove(script_file.name)
 
-    py_site_packages_path = os.path.join(ROOT_DIR, "_skbuild", "cmake-install")
-
     # Build ITK python
     with push_dir(directory=build_path, make_directory=True), \
             push_env(**build_env):
@@ -93,7 +91,7 @@ def build_wrapped_itk(
             "-DPYTHON_LIBRARY:FILEPATH=%s" % python_library,
             "-DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel",
             "-DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=ON",
-            "-DPY_SITE_PACKAGES_PATH:PATH=%s" % py_site_packages_path,
+            "-DPY_SITE_PACKAGES_PATH:PATH=.",
             "-DITK_LEGACY_SILENT:BOOL=ON",
             "-DITK_WRAP_PYTHON:BOOL=ON",
             "-DITK_WRAP_PYTHON_LEGACY:BOOL=OFF",
@@ -229,6 +227,7 @@ def build_wheels(py_envs=DEFAULT_PY_ENVS, single_wheel=False,
 
     prepare_build_env("35-x64")
     prepare_build_env("36-x64")
+    prepare_build_env("37-x64")
 
     with push_dir(directory=STANDALONE_DIR, make_directory=True):
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = '5.0a2'`
	`1`	`+VERSION = '5.0a02.dev20180905+392.gf5e254b'`
`2`	`2`
`3`	`3`	`def get_versions():`
`4`	`4`	`"""Returns versions for the ITK Python package.`