Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Continuous Integration #37

Merged
merged 2 commits into from
Jan 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:
- os: ubuntu-18.04
c-compiler: "gcc"
cxx-compiler: "g++"
itk-git-tag: "v5.1.1"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
cmake-build-type: "MinSizeRel"
- os: windows-2019
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
itk-git-tag: "v5.1.1"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
cmake-build-type: "Release"
- os: macos-10.15
c-compiler: "clang"
cxx-compiler: "clang++"
itk-git-tag: "v5.1.1"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
cmake-build-type: "MinSizeRel"

steps:
Expand All @@ -39,6 +39,9 @@ jobs:
python -m pip install --upgrade pip
python -m pip install ninja

- name: Get specific version of CMake, Ninja
uses: lukka/[email protected]

- name: Download ITK
run: |
cd ..
Expand Down Expand Up @@ -133,7 +136,7 @@ jobs:
matrix:
python-version: [36, 37, 38, 39]
include:
- itk-python-git-tag: "v5.1.1.post1"
- itk-python-git-tag: "v5.2rc01"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -169,11 +172,18 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.1.1.post1"
- itk-python-git-tag: "v5.2rc01"

steps:
- uses: actions/checkout@v2

- name: 'Specific XCode version'
run: |
sudo xcode-select -s "/Applications/Xcode_11.7.app"

- name: Get specific version of CMake, Ninja
uses: lukka/[email protected]

- name: 'Fetch build script'
run: |
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
Expand All @@ -198,7 +208,7 @@ jobs:
matrix:
python-version-minor: [6, 7, 8, 9]
include:
- itk-python-git-tag: "v5.1.1.post1"
- itk-python-git-tag: "v5.2rc01"

steps:
- uses: actions/checkout@v2
Expand All @@ -215,7 +225,7 @@ jobs:
shell: bash
run: |
mv im ../../
cd ../../
cd ../../im
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
Expand All @@ -236,7 +246,7 @@ jobs:
- name: Publish Python package as GitHub Artifact
uses: actions/upload-artifact@v1
with:
name: WindowWheel3.${{ matrix.python-version-minor }}
name: WindowsWheel3.${{ matrix.python-version-minor }}
path: ../../im/dist

publish-python-packages-to-pypi:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@
keywords='ITK InsightToolkit Phase-symmetry Multi-scale Fourier-domain',
url=r'https://github.com/KitwareMedical/ITKPhaseSymmetry',
install_requires=[
r'itk>=5.1.1.post1'
r'itk>=5.2rc1'
]
)
219 changes: 0 additions & 219 deletions test/azure-pipelines.yml

This file was deleted.