diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 9b35e0b..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 @@ -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: diff --git a/recipe/bld.bat b/recipe/bld.bat index 00547b4..3fb7a43 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 ^ @@ -19,11 +19,11 @@ cmake -T "v141,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_TIFF:BOOL=ON ^ - -D ITK_USE_SYSTEM_ZLIB:BOOL=ON ^ - -D Module_ITKTBB: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 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" ^ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a50dbaf..7f6d092 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 @@ -25,20 +25,20 @@ requirements: host: - python - setuptools - - libtiff - - libpng - - jpeg - - zlib - - tbb-devel + - libtiff # [not win] + - libpng # [not win] + - jpeg # [not win] + - zlib # [not win] + - 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('zlib', max_pin='x.x') }} - - tbb + - {{ 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') }} # [not win] + - tbb # [not win] test: imports: