Skip to content

Commit 7dfd436

Browse files
committed
Merge branch 'master' into release
2 parents 6809c1b + a4d90a2 commit 7dfd436

5 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ if(ITKPythonPackage_SUPERBUILD)
7373
include(ExternalProject)
7474

7575
set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
76-
# ITK nightly-master 2018-12-20
77-
set(ITK_GIT_TAG "v5.0b03")
76+
# ITK nightly-master 2019-01-30
77+
set(ITK_GIT_TAG "d18e45e358")
7878

7979
#-----------------------------------------------------------------------------
8080
# A separate project is used to download ITK, so that it can reused

itkVersion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '5.0b3'
1+
VERSION = '5.0b03.dev20190130+162.gd18e45e358'
22

33
def get_versions():
44
"""Returns versions for the ITK Python package.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ curl https://data.kitware.com/api/v1/file/592dd8068d777f16d01e1a92/download -o z
77
gunzip -d zstd-1.2.0-linux.tar.gz
88
tar xf zstd-1.2.0-linux.tar
99

10-
curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0b01}/ITKPythonBuilds-linux.tar.zst -O
10+
curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0b03}/ITKPythonBuilds-linux.tar.zst -O
1111
./zstd-1.2.0-linux/bin/unzstd ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar
1212
tar xf ITKPythonBuilds-linux.tar
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
brew update
77
brew install zstd aria2 gnu-tar doxygen
88
brew upgrade cmake
9-
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.0b01}/ITKPythonBuilds-macosx.tar.zst
9+
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
1010
unzstd ITKPythonBuilds-macosx.tar.zst -o ITKPythonBuilds-macosx.tar
1111
PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"
1212
tar xf ITKPythonBuilds-macosx.tar --checkpoint=10000 --checkpoint-action=dot

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $AllProtocols = [System.Net.SecurityProtocolType]'Ssl3,Tls,Tls11,Tls12'
44

55
set-alias sz "$env:ProgramFiles\7-Zip\7z.exe"
66
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')) }
7-
if (-not (Test-Path env:ITK_PACKAGE_VERSION)) { $env:ITK_PACKAGE_VERSION = 'v5.0b01' }
7+
if (-not (Test-Path env:ITK_PACKAGE_VERSION)) { $env:ITK_PACKAGE_VERSION = 'v5.0b03' }
88
Invoke-WebRequest -Uri "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/$env:ITK_PACKAGE_VERSION/ITKPythonBuilds-windows.zip" -OutFile "ITKPythonBuilds-windows.zip"
99
sz x ITKPythonBuilds-windows.zip -oC:\P -aoa -r
1010
Invoke-WebRequest -Uri "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -OutFile "doxygen-1.8.11.windows.bin.zip"

0 commit comments

Comments
 (0)