Merge pull request #74 from InsightSoftwareConsortium/itk-5.1rc03

Itk 5.1rc03

Author: thewtex

.github/workflows/python-packages.yml

@@ -0,0 +1,73 @@
+name: Python Packages
+
+on: [push]
+
+jobs:
+  Linux:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Fetch build script
+      run: |
+        curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
+        chmod u+x dockcross-manylinux-download-cache-and-build-module-wheels.sh
+
+    - name: Build Python packages
+      run: |
+        export ITK_PACKAGE_VERSION=v5.1rc03
+        ./dockcross-manylinux-download-cache-and-build-module-wheels.sh
+
+    - name: Upload wheel artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: LinuxWheels
+        path: dist
+
+  MacOS:
+    runs-on: macos-10.15
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Fetch build script
+      run: |
+        curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
+        chmod u+x macpython-download-cache-and-build-module-wheels.sh
+
+    - name: Build Python packages
+      run: |
+        export ITK_PACKAGE_VERSION=v5.1rc03
+        ./macpython-download-cache-and-build-module-wheels.sh
+
+    - name: Upload wheel artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: MacOSWheels
+        path: dist
+
+  Windows:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Fetch build script
+      run: |
+        curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/windows-download-cache-and-build-module-wheels.ps1 -O
+
+    - name: Build Python packages
+      run: |
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        set ITK_PACKAGE_VERSION=v5.1rc03
+        set CC=cl.exe
+        set CXX=cl.exe
+        powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1
+      shell: cmd
+
+    - name: Upload wheel artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: WindowsWheels
+        path: dist

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name='itk-minimalpathextraction',
-    version='1.0.2',
+    version='1.1rc1',
     author='Insight Software Consortium',
     author_email='[email protected]',
     packages=['itk'],
@@ -49,6 +49,6 @@
     keywords='ITK InsightToolkit',
     url=r'https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction',
     install_requires=[
-        r'itk>=5.0.0.post1'
+        r'itk>=5.1rc3'
     ]
     )

test/azure-pipelines.yml

@@ -1,6 +1,6 @@
 variables:
-  ITKGitTag: v5.1rc02
-  ITKPythonPost: v5.1rc02
+  ITKGitTag: v5.1rc03
+  ITKPythonGitTag: v5.1rc03
   CMakeBuildType: Release
 
 trigger:
@@ -19,20 +19,20 @@ jobs:
   strategy:
     matrix:
       Linux:
-        imageName: 'ubuntu-16.04'
+        imageName: 'ubuntu-18.04'
         cCompiler: gcc
         cxxCompiler: g++
         compilerInitialization: ''
       macOS:
-        imageName: 'macos-10.13'
+        imageName: 'macos-10.15'
         cCompiler: clang
         cxxCompiler: clang++
         compilerInitialization: ''
       Windows:
-        imageName: 'vs2017-win2016'
+        imageName: 'windows-2019'
         cCompiler: cl.exe
         cxxCompiler: cl.exe
-        compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
+        compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
 
   pool:
     vmImage: $(imageName)
@@ -58,7 +58,9 @@ jobs:
     displayName: 'Install build dependencies'
 
   - script: |
-      git clone --depth 5 --branch $(ITKGitTag) https://github.com/InsightSoftwareConsortium/ITK.git
+      git clone https://github.com/InsightSoftwareConsortium/ITK.git
+      cd ITK
+      git checkout $(ITKGitTag)
     workingDirectory: $(Agent.BuildDirectory)
     displayName: 'Download ITK'
 
@@ -148,7 +150,7 @@ jobs:
   cancelTimeoutInMinutes: 300
   displayName: "Build Linux Python packages"
   pool:
-    vmImage: 'Ubuntu-16.04'
+    vmImage: 'Ubuntu-18.04'
 
   steps:
   - script: |
@@ -157,7 +159,7 @@ jobs:
     displayName: 'Fetch build script'
 
   - script: |
-      export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
+      export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
       ./dockcross-manylinux-download-cache-and-build-module-wheels.sh
     displayName: 'Build Python packages'
 
@@ -172,7 +174,7 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: 'macos-10.14'
+    vmImage: 'macos-10.15'
 
   steps:
   - script: |
@@ -181,7 +183,7 @@ jobs:
     displayName: 'Fetch build script'
 
   - script: |
-      export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
+      export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
       ./macpython-download-cache-and-build-module-wheels.sh
     displayName: 'Build Python packages'
 
@@ -196,16 +198,16 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
 
   steps:
   - script: |
       curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/windows-download-cache-and-build-module-wheels.ps1 -O
     displayName: 'Fetch build script'
 
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-      set ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
       set CC=cl.exe
       set CXX=cl.exe
       powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1