Skip to content

Commit

Permalink
Merge pull request #63 from thewtex/post2
Browse files Browse the repository at this point in the history
ENH: Build against itk 5.1.0.post2
  • Loading branch information
thewtex authored Jun 9, 2020
2 parents 5cdccb1 + bb3ac00 commit 305e3f3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
25 changes: 15 additions & 10 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ jobs:
operating_system="${{ matrix.os }}"
cat > dashboard.cmake << EOF
set(CTEST_SITE "GitHubActions")
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT)
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY)
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT)
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY)
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
set(dashboard_source_name "${GITHUB_REPOSITORY}")
if(ENV{GITHUB_REF} MATCHES "master")
set(branch "-master")
Expand Down Expand Up @@ -114,13 +114,13 @@ jobs:
- name: Build and test
if: matrix.os != 'windows-2019'
run: |
ctest -j 2 -V -S dashboard.cmake
ctest --output-on-failure -j 2 -V -S dashboard.cmake
- name: Build and test
if: matrix.os == 'windows-2019'
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
ctest -j 2 -V -S dashboard.cmake
ctest --output-on-failure -j 2 -V -S dashboard.cmake
shell: cmd

build-linux-python-packages:
Expand All @@ -130,7 +130,7 @@ jobs:
matrix:
python-version: [35, 36, 37, 38]
include:
- itk-python-git-tag: "v5.1.0"
- itk-python-git-tag: "v5.1.0.post2"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.1.0"
- itk-python-git-tag: "v5.1.0.post2"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -195,10 +195,12 @@ jobs:
matrix:
python-version-minor: [5, 6, 7, 8]
include:
- itk-python-git-tag: "v5.1.0"
- itk-python-git-tag: "v5.1.0.post2"

steps:
- uses: actions/checkout@v2
with:
path: "im"

- name: 'Install Python'
run: |
Expand All @@ -209,6 +211,8 @@ jobs:
- name: 'Fetch build dependencies'
shell: bash
run: |
mv im ../../
cd ../../
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 @@ -219,17 +223,18 @@ jobs:
- name: 'Build 🐍 Python 📦 package'
shell: cmd
run: |
cd ../../im
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
set PATH="C:\P\grep;%PATH%"
set CC=cl.exe
set CXX=cl.exe
C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64"
C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64" --no-cleanup
- name: Publish Python package as GitHub Artifact
uses: actions/upload-artifact@v1
with:
name: WindowWheel3.${{ matrix.python-version-minor }}
path: dist
path: ../../im/dist

publish-python-packages-to-pypi:
needs:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='itk-cuberille',
version='2.2.0',
version='2.3.0',
author='Dan Mueller',
author_email='itk+community@discourse.itk.org',
packages=['itk'],
Expand Down Expand Up @@ -44,6 +44,6 @@
keywords='ITK InsightToolkit',
url=r'https://itk.org/',
install_requires=[
r'itk>=5.1.0'
r'itk>=5.1.0.post2'
]
)

0 comments on commit 305e3f3

Please sign in to comment.