Merge branch 'master' into release

Author: thewtex

CMakeLists.txt

@@ -73,8 +73,8 @@ if(ITKPythonPackage_SUPERBUILD)
   include(ExternalProject)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
-  # ITK release 2019-02-01
-  set(ITK_GIT_TAG "3a11b90d06513")
+  # ITK nightly-master 2019-04-25
+  set(ITK_GIT_TAG "c351787a26")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused
@@ -137,6 +137,9 @@ if(ITKPythonPackage_SUPERBUILD)
   if(DEFINED PYTHON_EXECUTABLE AND NOT EXISTS ${PYTHON_EXECUTABLE})
     message(FATAL_ERROR "PYTHON_EXECUTABLE variable is defined but corresponds to nonexistent file")
   endif()
+  if(DEFINED DOXYGEN_EXECUTABLE AND NOT EXISTS ${DOXYGEN_EXECUTABLE})
+    message(FATAL_ERROR "DOXYGEN_EXECUTABLE variable is defined but corresponds to nonexistent file")
+  endif()
 
   if(NOT DEFINED PYTHON_INCLUDE_DIR
      OR NOT DEFINED PYTHON_LIBRARY
@@ -146,6 +149,9 @@ if(ITKPythonPackage_SUPERBUILD)
     find_package ( PythonInterp REQUIRED )
 
   endif()
+  if(NOT DEFINED DOXYGEN_EXECUTABLE)
+    find_package(Doxygen REQUIRED)
+  endif()
 
   message(STATUS "SuperBuild -   PYTHON_INCLUDE_DIR: ${PYTHON_INCLUDE_DIR}")
   message(STATUS "SuperBuild -   PYTHON_LIBRARY: ${PYTHON_LIBRARY}")

docs/Build_ITK_Module_Python_packages.rst

@@ -115,6 +115,7 @@ First, install Microsoft Visual Studio 2015, Git, and CMake, which should be add
 Open a PowerShell terminal as Administrator, and install Python::
 
 	PS C:\> Set-ExecutionPolicy Unrestricted
+	PS C:\> $pythonArch = "64"
 	PS C:\> iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/scikit-build/scikit-ci-addons/master/windows/install-python.ps1'))
 
 In a PowerShell prompt, run the `windows-build-wheels.ps1` script::

docs/Build_ITK_Python_packages.rst

@@ -65,6 +65,7 @@ First, install Microsoft Visual Studio 2015, Git, and CMake, which should be add
 Open a PowerShell terminal as Administrator, and install Python::
 
 	PS C:\> Set-ExecutionPolicy Unrestricted
+	PS C:\> $pythonArch = "64"
 	PS C:\> iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/scikit-build/scikit-ci-addons/master/windows/install-python.ps1'))
 
 In a PowerShell prompt::

itkVersion.py

@@ -1,4 +1,4 @@
-VERSION = '5.0rc1'
+VERSION = '5.0rc01.dev20190425+471.gc351787a26'
 
 def get_versions():
     """Returns versions for the ITK Python package.

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

@@ -7,7 +7,7 @@ curl https://data.kitware.com/api/v1/file/592dd8068d777f16d01e1a92/download -o z
 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.0b03}/ITKPythonBuilds-linux.tar.zst -O
+curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0rc01}/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
 

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.0b03}/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.0rc01}/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

scripts/windows-download-cache-and-build-module-wheels.ps1

@@ -3,8 +3,11 @@ $AllProtocols = [System.Net.SecurityProtocolType]'Ssl3,Tls,Tls11,Tls12'
 [System.Net.ServicePointManager]::SecurityProtocol = $AllProtocols
 
 set-alias sz "$env:ProgramFiles\7-Zip\7z.exe"
-if (-not (Test-Path env:APPVEYOR)) { 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.0b03' }
+if (-not (Test-Path env:APPVEYOR)) {
+  $pythonArch = "64"
+  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.0rc01' }
 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 "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -OutFile "doxygen-1.8.11.windows.bin.zip"