Skip to content

Commit

Permalink
Merge pull request #92 from InsightSoftwareConsortium/itk-5.2
Browse files Browse the repository at this point in the history
ENH: Update to ITK 5.2.0
  • Loading branch information
thewtex authored Apr 21, 2021
2 parents 8223197 + dd60884 commit ac51a32
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ jobs:
- os: ubuntu-18.04
c-compiler: "gcc"
cxx-compiler: "g++"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
itk-git-tag: "v5.2.0"
cmake-build-type: "MinSizeRel"
- os: windows-2019
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
itk-git-tag: "v5.2.0"
cmake-build-type: "Release"
- os: macos-10.15
c-compiler: "clang"
cxx-compiler: "clang++"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
itk-git-tag: "v5.2.0"
cmake-build-type: "MinSizeRel"

steps:
- uses: actions/checkout@v1

- name: Set up Python 3.7
uses: actions/setup-python@v1
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.8

- name: Install build dependencies
run: |
Expand Down Expand Up @@ -130,13 +130,13 @@ jobs:
shell: cmd

build-linux-python-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
max-parallel: 2
matrix:
python-version: [36, 37, 38, 39]
include:
- itk-python-git-tag: "v5.2rc01"
- itk-python-git-tag: "v5.2.0"

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

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
matrix:
python-version-minor: [6, 7, 8, 9]
include:
- itk-python-git-tag: "v5.2rc01"
- itk-python-git-tag: "v5.2.0"

steps:
- name: Get specific version of CMake, Ninja
Expand All @@ -228,7 +228,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 Down Expand Up @@ -257,7 +257,7 @@ jobs:
- build-linux-python-packages
- build-macos-python-packages
- build-windows-python-packages
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- name: Download Python Packages
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name='itk-texturefeatures',
version='3.4.0',
version='3.5.0',
author='Insight Software Consortium',
author_email='[email protected]',
packages=['itk'],
Expand Down Expand Up @@ -48,6 +48,6 @@
keywords='ITK InsightToolkit glcm texture features image imaging',
url=r'https://itk.org/',
install_requires=[
r'itk>=5.2rc1'
r'itk>=5.2.0'
]
)

0 comments on commit ac51a32

Please sign in to comment.