Merge remote-tracking branch 'upstream/master' into release

Author: thewtex

.travis.yml

@@ -8,7 +8,7 @@ cache:
   - $HOME/docker
 
 before_install:
-  - pip install -U scikit-ci-addons
+  - sudo pip install -U scikit-ci-addons
   - ci_addons docker load-pull-save r.j3ss.co/shellcheck
 
 script:

docs/Build_ITK_Module_Python_packages.rst

@@ -52,11 +52,12 @@ These services use the configurations generated by the `ITKModuleTemplate <https
   Linux Python package wheel links can be found in the CircleCI *Artifacts*
   tab after expanding the available folders.
 
-.. figure:: https://i.imgur.com/Yw3ziU7.png
+.. figure:: https://imgur.com/tHMhTII.png
   :alt: TravisCI Python wheels
 
-  macOS Python package wheels can be downloaded by going to the `transfer.sh`
-  link found in the build output.
+  macOS Python package wheels can be downloaded by visiting to the `file.io`
+  link found in the build output. Note: this link may only be valid for the
+  initial download.
 
 .. figure:: http://imgur.com/Cj5vs3S.png
   :alt: AppVeyor Python wheels

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.13.0/ITKPythonBuilds-linux.tar.zst -O
+curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0a01}/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-build-wheels.sh

@@ -181,5 +181,5 @@ for VENV in "${VENVS[@]}"; do
     (cd $HOME && ${VENV}/bin/python -c 'import itk;')
     (cd $HOME && ${VENV}/bin/python -c 'import itk; image = itk.Image[itk.UC, 2].New()')
     (cd $HOME && ${VENV}/bin/python -c 'import itkConfig; itkConfig.LazyLoading = False; import itk;')
-    (cd $HOME && ${PYBIN}/python ${SCRIPT_DIR}/../docs/code/testDriver.py )
+    (cd $HOME && ${VENV}/bin/python ${SCRIPT_DIR}/../docs/code/testDriver.py )
 done

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

@@ -5,7 +5,8 @@
 
 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.13.0}/ITKPythonBuilds-macosx.tar.zst
+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
 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

@@ -1,8 +1,9 @@
 trap { Write-Error $_; Exit 1 }
 
-set-alias sz "$env:ProgramFiles\7-Zip\7z.exe"  
+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.13.0/ITKPythonBuilds-windows.zip" -OutFile "ITKPythonBuilds-windows.zip"
+if (-not (Test-Path env:ITK_PACKAGE_VERSION)) { $env:ITK_PACKAGE_VERSION = 'v5.0a01' }
+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"
 sz x doxygen-1.8.11.windows.bin.zip -oC:\P\doxygen -aoa -r