From 5d057441410107280ab58b87a325c50630a22b39 Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Mon, 17 Apr 2023 07:47:23 -0400 Subject: [PATCH 1/7] Increase build number for new build --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a50dbaf..32cdb16 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "simpleitk" %} {% set version = "2.2.1" %} -{% set build_number = 0 %} +{% set build_number = 1 %} package: name: simpleitk From b094ec9895ae445b3fe32b04050562628bbba05b Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Mon, 17 Apr 2023 11:33:03 -0400 Subject: [PATCH 2/7] Build python 3.11 --- .github/workflows/build-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 9b35e0b..0a4b4d6 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -29,7 +29,7 @@ jobs: build-windows: strategy: matrix: - python_version: ['3.7', '3.8', '3.9', '3.10'] + python_version: ['3.7', '3.8', '3.9', '3.10', '3.11'] runs-on: windows-2019 steps: From e6f70d6f294b9f1523831dc80128e98bb723f293 Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Fri, 21 Apr 2023 07:21:33 -0400 Subject: [PATCH 3/7] WIP: Testing with v142 and disabling TBB --- recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 00547b4..9fd7a21 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -10,7 +10,7 @@ set CXXFLAGS=/MP set CFLAGS=/MP REM Configure Step -cmake -T "v141,host=x64" -G "Visual Studio 16 2019" ^ +cmake -T "v142,host=x64" -G "Visual Studio 16 2019" ^ -D SimpleITK_BUILD_DISTRIBUTE:BOOL=ON ^ -D BUILD_SHARED_LIBS:BOOL=OFF ^ -D BUILD_TESTING:BOOL=OFF ^ @@ -23,7 +23,7 @@ cmake -T "v141,host=x64" -G "Visual Studio 16 2019" ^ -D ITK_USE_SYSTEM_PNG:BOOL=ON ^ -D ITK_USE_SYSTEM_TIFF:BOOL=ON ^ -D ITK_USE_SYSTEM_ZLIB:BOOL=ON ^ - -D Module_ITKTBB:BOOL=ON ^ + -D Module_ITKTBB:BOOL=OFF ^ -D "CMAKE_FIND_ROOT_PATH:PATH=%PREFIX%" ^ -D "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE:STRING=ONLY" ^ -D "CMAKE_FIND_ROOT_PATH_MODE_LIBRARY:STRING=ONLY" ^ From 794b52e0925320fe075d88d68bf0bb7b17b12fc3 Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Fri, 21 Apr 2023 12:52:16 -0400 Subject: [PATCH 4/7] Removing tiff and zlib shared libs too --- recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9fd7a21..1352980 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -21,8 +21,8 @@ cmake -T "v142,host=x64" -G "Visual Studio 16 2019" ^ -D SimpleITK_PYTHON_USE_VIRTUALENV:BOOL=OFF ^ -D ITK_USE_SYSTEM_JPEG:BOOL=ON ^ -D ITK_USE_SYSTEM_PNG:BOOL=ON ^ - -D ITK_USE_SYSTEM_TIFF:BOOL=ON ^ - -D ITK_USE_SYSTEM_ZLIB:BOOL=ON ^ + -D ITK_USE_SYSTEM_TIFF:BOOL=OFF ^ + -D ITK_USE_SYSTEM_ZLIB:BOOL=OFF ^ -D Module_ITKTBB:BOOL=OFF ^ -D "CMAKE_FIND_ROOT_PATH:PATH=%PREFIX%" ^ -D "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE:STRING=ONLY" ^ From a1bfb036e75b89c4a24cc3059cef6be362b07145 Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Tue, 25 Apr 2023 08:43:41 -0400 Subject: [PATCH 5/7] Remove more deps on windows --- recipe/bld.bat | 6 +++--- recipe/meta.yaml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 1352980..298ce29 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -19,10 +19,10 @@ cmake -T "v142,host=x64" -G "Visual Studio 16 2019" ^ -D WRAP_PYTHON:BOOL=ON ^ -D SimpleITK_USE_SYSTEM_SWIG:BOOL=ON ^ -D SimpleITK_PYTHON_USE_VIRTUALENV:BOOL=OFF ^ - -D ITK_USE_SYSTEM_JPEG:BOOL=ON ^ - -D ITK_USE_SYSTEM_PNG:BOOL=ON ^ + -D ITK_USE_SYSTEM_JPEG:BOOL=OFF ^ + -D ITK_USE_SYSTEM_PNG:BOOL=OFF ^ -D ITK_USE_SYSTEM_TIFF:BOOL=OFF ^ - -D ITK_USE_SYSTEM_ZLIB:BOOL=OFF ^ + -D ITK_USE_SYSTEM_ZLIB:BOOL=ON ^ -D Module_ITKTBB:BOOL=OFF ^ -D "CMAKE_FIND_ROOT_PATH:PATH=%PREFIX%" ^ -D "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE:STRING=ONLY" ^ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 32cdb16..f5ffe82 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,20 +25,20 @@ requirements: host: - python - setuptools - - libtiff - - libpng - - jpeg + - libtiff # [not win] + - libpng # [not win] + - jpeg # [not win] - zlib - - tbb-devel + - tbb-devel # [not win] run: - vs2015_runtime # [win] - python - - {{ pin_compatible('libtiff', max_pin='x.x') }} - - {{ pin_compatible('libpng', max_pin='x.x') }} - - {{ pin_compatible('jpeg', max_pin='x') }} + - {{ pin_compatible('libtiff', max_pin='x.x') }} # [not win] + - {{ pin_compatible('libpng', max_pin='x.x') }} # [not win] + - {{ pin_compatible('jpeg', max_pin='x') }} # [not win] - {{ pin_compatible('zlib', max_pin='x.x') }} - - tbb + - tbb # [not win] test: imports: From fd8bc05b71276ddb4ac90bf700c556fcfb5c2418 Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Thu, 27 Apr 2023 09:12:44 -0400 Subject: [PATCH 6/7] Remove more deps on windows --- recipe/bld.bat | 2 +- recipe/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 298ce29..3fb7a43 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -22,7 +22,7 @@ cmake -T "v142,host=x64" -G "Visual Studio 16 2019" ^ -D ITK_USE_SYSTEM_JPEG:BOOL=OFF ^ -D ITK_USE_SYSTEM_PNG:BOOL=OFF ^ -D ITK_USE_SYSTEM_TIFF:BOOL=OFF ^ - -D ITK_USE_SYSTEM_ZLIB:BOOL=ON ^ + -D ITK_USE_SYSTEM_ZLIB:BOOL=OFF ^ -D Module_ITKTBB:BOOL=OFF ^ -D "CMAKE_FIND_ROOT_PATH:PATH=%PREFIX%" ^ -D "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE:STRING=ONLY" ^ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f5ffe82..7f6d092 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,7 +28,7 @@ requirements: - libtiff # [not win] - libpng # [not win] - jpeg # [not win] - - zlib + - zlib # [not win] - tbb-devel # [not win] run: @@ -37,7 +37,7 @@ requirements: - {{ pin_compatible('libtiff', max_pin='x.x') }} # [not win] - {{ pin_compatible('libpng', max_pin='x.x') }} # [not win] - {{ pin_compatible('jpeg', max_pin='x') }} # [not win] - - {{ pin_compatible('zlib', max_pin='x.x') }} + - {{ pin_compatible('zlib', max_pin='x.x') }} # [not win] - tbb # [not win] test: From dbf0a02a3fdad73f5959620bf11bc1caf173309d Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Thu, 27 Apr 2023 16:24:45 -0400 Subject: [PATCH 7/7] Update conda and conda build version in GHA --- .github/workflows/build-and-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 0a4b4d6..4bab0b4 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -10,8 +10,8 @@ on: workflow_dispatch: env: - conda_version: 4.12.0 - conda_build_version: 3.21.8 + conda_version: 23.3.1 + conda_build_version: 3.24.0 jobs: set-anaconda-tag: runs-on: ubuntu-latest