Merge pull request #76 from thewtex/itk5.1rc2

thewtex · web-flow · commit 0b13efd41fcf · 2020-03-03T22:37:50.000-05:00
BUG: Revert "ENH: Update azure module for ITK 5.1rc2"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,7 +1,7 @@
-# The file template originates from the instructions: https://github.com/InsightSoftwareConsortium/ITKModuleTemplate/README.md
+# The file template originates from: https://github.com/InsightSoftwareConsortium/ITKModuleTemplate
 variables:
-  ITKGitTag: v5.1rc02       #Used for choosing branch of ITK to checkout
-  ITKPythonGitTag: v5.1rc02 #Used to identify the release name for the cached python build environmeent ITKPythonBuilds-linux.tar.zst
+  ITKGitTag: v5.1rc02
+  ITKPythonGitTag: v5.1rc02
   CMakeBuildType: Release
 
 trigger:
@@ -19,36 +19,21 @@ jobs:
 
   strategy:
     matrix:
-#     Linux1604:
-#       imageName: 'ubuntu-16.04'
-#       cCompiler: gcc
-#       cxxCompiler: g++
-#       compilerInitialization: ''
-     Linux1804:
-       imageName: 'ubuntu-18.04'
-       cCompiler: gcc
-       cxxCompiler: g++
-       compilerInitialization: ''
-     macOS1015:
-       imageName: 'macos-10.15'
-       cCompiler: clang
-       cxxCompiler: clang++
-       compilerInitialization: ''
-#     macOS1014:
-#       imageName: 'macos-10.14'
-#       cCompiler: clang
-#       cxxCompiler: clang++
-#       compilerInitialization: ''
-#     Windows2017:
-#       imageName: 'vs2017-win2016'
-#       cCompiler: cl.exe
-#       cxxCompiler: cl.exe
-#       compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
-     Windows2019:
-       imageName: 'windows-2019'
-       cCompiler: cl.exe
-       cxxCompiler: cl.exe
-       compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
+      Linux:
+        imageName: 'ubuntu-16.04'
+        cCompiler: gcc
+        cxxCompiler: g++
+        compilerInitialization: ''
+      macOS:
+        imageName: 'macos-10.13'
+        cCompiler: clang
+        cxxCompiler: clang++
+        compilerInitialization: ''
+      Windows:
+        imageName: 'vs2017-win2016'
+        cCompiler: cl.exe
+        cxxCompiler: cl.exe
+        compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
 
   pool:
     vmImage: $(imageName)
@@ -75,10 +60,7 @@ jobs:
     displayName: 'Install build dependencies'
 
   - script: |
-      #git clone https://github.com/InsightSoftwareConsortium/ITK.git
       git clone --depth 5 --branch $(ITKGitTag) https://github.com/InsightSoftwareConsortium/ITK.git
-      cd ITK
-      git checkout $(ITKGitTag)
     workingDirectory: $(Agent.BuildDirectory)
     displayName: 'Download ITK'
 
@@ -104,7 +86,7 @@ jobs:
       cat > dashboard.cmake << EOF
       set(CTEST_SITE "Azure.\$ENV{AGENT_MACHINENAME}")
       file(TO_CMAKE_PATH "\$ENV{AGENT_BUILDDIRECTORY}" CTEST_DASHBOARD_ROOT)
-      file(TO_CMAKE_PATH "\$ENV{BUILD_SOURCESDIRECTORY}" CTEST_SOURCE_DIRECTORY)
+      file(TO_CMAKE_PATH "\$ENV{AGENT_BUILDDIRECTORY}/ITKModuleTemplate" CTEST_SOURCE_DIRECTORY)
       file(TO_CMAKE_PATH "\$ENV{AGENT_BUILDDIRECTORY}/build" CTEST_BINARY_DIRECTORY)
       set(dashboard_source_name "$(Build.Repository.Name)")
       if(DEFINED ENV{SYSTEM_PULLREQUEST_SOURCEBRANCH})
@@ -156,7 +138,7 @@ jobs:
       sudo pip3 install --upgrade pip
       sudo pip3 install --upgrade setuptools
       sudo pip3 install scikit-ci-addons
-      ci_addons ctest_junit_formatter $(Agent.BuildDirectory)/build > $(Agent.BuildDirectory)/JUnitTestResults.xml
+      ci_addons ctest_junit_formatter "$(Agent.BuildDirectory)/build" > "$(Agent.BuildDirectory)/JUnitTestResults.xml"
     condition: succeededOrFailed()
     displayName: 'Format CTest output in JUnit format'
 
@@ -168,95 +150,98 @@ jobs:
     displayName: 'Publish test results'
 
 
-  - job: 'PackageLinux'
-    timeoutInMinutes: 0
-    cancelTimeoutInMinutes: 300
-    displayName: "Build Linux Python packages"
-    pool:
-      vmImage: 'Ubuntu-16.04'
-  
-    steps:
-    - script: |
-        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
-      displayName: 'Fetch build script'
-  
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.7'
-        architecture: 'x64'
-  
-    - script: |
-        python -m pip install cookiecutter
-        python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
-      displayName: 'Evaluate template'
-  
-    - script: |
-        export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
-        ./dockcross-manylinux-download-cache-and-build-module-wheels.sh
-      displayName: 'Build Python packages'
-  
-    - task: PublishPipelineArtifact@0
-      inputs:
-        artifactName: 'LinuxWheels'
-        targetPath: './dist'
-  
-  
-  - job: 'PackageMacOS'
-    displayName: "Build macOS Python packages"
-    timeoutInMinutes: 0
-    cancelTimeoutInMinutes: 300
-    pool:
-      vmImage: 'macos-10.14'
-  
-    steps:
-    - script: |
-        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
-      displayName: 'Fetch build script'
-  
-    - script: |
-        python -m pip install cookiecutter
-        python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
-      displayName: 'Evaluate template'
-  
-    - script: |
-        export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
-        ./macpython-download-cache-and-build-module-wheels.sh
-      displayName: 'Build Python packages'
-  
-    - task: PublishPipelineArtifact@0
-      inputs:
-        artifactName: 'MacOSWheels'
-        targetPath: './dist'
-  
-  
-  - job: 'PackageWindows'
-    displayName: "Build Windows Python packages"
-    timeoutInMinutes: 0
-    cancelTimeoutInMinutes: 300
-    pool:
-      vmImage: 'vs2017-win2016'
-  
-    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: |
-        python -m pip install cookiecutter
-        python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
-      displayName: 'Evaluate template'
-  
-    - script: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2017\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
-      displayName: 'Build Python packages'
-  
-    - task: PublishPipelineArtifact@0
-      inputs:
-        artifactName: 'WindowsWheels'
-        targetPath: './dist'
+- job: 'PackageLinux'
+  timeoutInMinutes: 0
+  cancelTimeoutInMinutes: 300
+  displayName: "Build Linux Python packages"
+  pool:
+    vmImage: 'Ubuntu-16.04'
+
+  steps:
+  - script: |
+      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
+    displayName: 'Fetch build script'
+
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.7'
+      architecture: 'x64'
+
+  - script: |
+      python -m pip install cookiecutter
+      python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
+    displayName: 'Evaluate template'
+
+  - script: |
+      cd $(Agent.BuildDirectory)/ITKModuleTemplate
+      export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
+      $(Build.SourcesDirectory)/dockcross-manylinux-download-cache-and-build-module-wheels.sh
+    displayName: 'Build Python packages'
+
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: 'LinuxWheels'
+      targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'
+
+
+- job: 'PackageMacOS'
+  displayName: "Build macOS Python packages"
+  timeoutInMinutes: 0
+  cancelTimeoutInMinutes: 300
+  pool:
+    vmImage: 'macos-10.14'
+
+  steps:
+  - script: |
+      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
+    displayName: 'Fetch build script'
+
+  - script: |
+      python -m pip install cookiecutter
+      python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
+    displayName: 'Evaluate template'
+
+  - script: |
+      cd $(Agent.BuildDirectory)/ITKModuleTemplate
+      export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
+      $(Build.SourcesDirectory)/macpython-download-cache-and-build-module-wheels.sh
+    displayName: 'Build Python packages'
+
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: 'MacOSWheels'
+      targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'
+
+
+- job: 'PackageWindows'
+  displayName: "Build Windows Python packages"
+  timeoutInMinutes: 0
+  cancelTimeoutInMinutes: 300
+  pool:
+    vmImage: 'vs2017-win2016'
+
+  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: |
+      python -m pip install cookiecutter
+      python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
+    displayName: 'Evaluate template'
+
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      cd $(Agent.BuildDirectory)\ITKModuleTemplate
+      set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
+      set CC=cl.exe
+      set CXX=cl.exe
+      powershell.exe -file $(Build.SourcesDirectory)\windows-download-cache-and-build-module-wheels.ps1
+    displayName: 'Build Python packages'
+
+  - task: PublishPipelineArtifact@0
+    inputs:
+      artifactName: 'WindowsWheels'
+      targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'
diff --git a/{{cookiecutter.project_name}}/include/itkMinimalStandardRandomVariateGenerator.h b/{{cookiecutter.project_name}}/include/itkMinimalStandardRandomVariateGenerator.h
@@ -1,6 +1,6 @@
 /*=========================================================================
  *
- *  Copyright Insight Software Consortium
+ *  Copyright NumFOCUS
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/{{cookiecutter.project_name}}/include/itk{{cookiecutter.filter_name}}.h b/{{cookiecutter.project_name}}/include/itk{{cookiecutter.filter_name}}.h
@@ -1,6 +1,6 @@
 /*=========================================================================
  *
- *  Copyright Insight Software Consortium
+ *  Copyright NumFOCUS
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/{{cookiecutter.project_name}}/include/itk{{cookiecutter.filter_name}}.hxx b/{{cookiecutter.project_name}}/include/itk{{cookiecutter.filter_name}}.hxx
@@ -1,6 +1,6 @@
 /*=========================================================================
  *
- *  Copyright Insight Software Consortium
+ *  Copyright NumFOCUS
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/{{cookiecutter.project_name}}/src/itkMinimalStandardRandomVariateGenerator.cxx b/{{cookiecutter.project_name}}/src/itkMinimalStandardRandomVariateGenerator.cxx
@@ -1,6 +1,6 @@
 /*=========================================================================
  *
- *  Copyright Insight Software Consortium
+ *  Copyright NumFOCUS
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/{{cookiecutter.project_name}}/test/itkMinimalStandardRandomVariateGeneratorTest.cxx b/{{cookiecutter.project_name}}/test/itkMinimalStandardRandomVariateGeneratorTest.cxx
@@ -1,6 +1,6 @@
 /*=========================================================================
  *
- *  Copyright Insight Software Consortium
+ *  Copyright NumFOCUS
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/{{cookiecutter.project_name}}/test/itk{{cookiecutter.filter_name}}Test.cxx b/{{cookiecutter.project_name}}/test/itk{{cookiecutter.filter_name}}Test.cxx
@@ -1,6 +1,6 @@
 /*=========================================================================
  *
- *  Copyright Insight Software Consortium
+ *  Copyright NumFOCUS
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*=========================================================================`
`2`	`2`	`*`
`3`		`- * Copyright Insight Software Consortium`
	`3`	`+ * Copyright NumFOCUS`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`* you may not use this file except in compliance with the License.`