diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 623b1534..8ab96030 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,6 +16,10 @@ jobs: CONFIG: linux_64_build_varianteglpython3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_varianteglpython3.12.____cpython: + CONFIG: linux_64_build_varianteglpython3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_varianteglpython3.8.____cpython: CONFIG: linux_64_build_varianteglpython3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -32,6 +36,10 @@ jobs: CONFIG: linux_64_build_variantosmesapython3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_variantosmesapython3.12.____cpython: + CONFIG: linux_64_build_variantosmesapython3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_variantosmesapython3.8.____cpython: CONFIG: linux_64_build_variantosmesapython3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -48,6 +56,10 @@ jobs: CONFIG: linux_64_build_variantqtpython3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_build_variantqtpython3.12.____cpython: + CONFIG: linux_64_build_variantqtpython3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_build_variantqtpython3.8.____cpython: CONFIG: linux_64_build_variantqtpython3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -64,6 +76,10 @@ jobs: CONFIG: linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_python3.12.____cpython: + CONFIG: linux_aarch64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.8.____cpython: CONFIG: linux_aarch64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -80,6 +96,10 @@ jobs: CONFIG: linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_python3.12.____cpython: + CONFIG: linux_ppc64le_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_python3.8.____cpython: CONFIG: linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 052ccf05..59f5edb6 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,6 +14,9 @@ jobs: osx_64_python3.11.____cpython: CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_64_python3.8.____cpython: CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -26,6 +29,9 @@ jobs: osx_arm64_python3.11.____cpython: CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_python3.8.____cpython: CONFIG: osx_arm64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index b6303f10..69f471b0 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,9 @@ jobs: win_64_python3.11.____cpython: CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_python3.12.____cpython: + CONFIG: win_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' win_64_python3.8.____cpython: CONFIG: win_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml b/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml new file mode 100644 index 00000000..d9d5b20e --- /dev/null +++ b/.ci_support/linux_64_build_varianteglpython3.12.____cpython.yaml @@ -0,0 +1,75 @@ +build_variant: +- egl +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +expat: +- '2' +ffmpeg: +- '6' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.2 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxcb: +- '1.15' +libxml2: +- '2.11' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.0 +pugixml: +- '1.13' +python: +- 3.12.* *_cpython +qt_main: +- '5.15' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.5 +zip_keys: +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml new file mode 100644 index 00000000..7a5d0aea --- /dev/null +++ b/.ci_support/linux_64_build_variantosmesapython3.12.____cpython.yaml @@ -0,0 +1,75 @@ +build_variant: +- osmesa +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +expat: +- '2' +ffmpeg: +- '6' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.2 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxcb: +- '1.15' +libxml2: +- '2.11' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.0 +pugixml: +- '1.13' +python: +- 3.12.* *_cpython +qt_main: +- '5.15' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.5 +zip_keys: +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml b/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml new file mode 100644 index 00000000..c7aace62 --- /dev/null +++ b/.ci_support/linux_64_build_variantqtpython3.12.____cpython.yaml @@ -0,0 +1,75 @@ +build_variant: +- qt +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +expat: +- '2' +ffmpeg: +- '6' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.2 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxcb: +- '1.15' +libxml2: +- '2.11' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.0 +pugixml: +- '1.13' +python: +- 3.12.* *_cpython +qt_main: +- '5.15' +sqlite: +- '3' +target_platform: +- linux-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.5 +zip_keys: +- - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml new file mode 100644 index 00000000..152d76b5 --- /dev/null +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -0,0 +1,72 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +build_variant: +- qt +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +expat: +- '2' +ffmpeg: +- '6' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.2 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxcb: +- '1.15' +libxml2: +- '2.11' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.0 +pugixml: +- '1.13' +python: +- 3.12.* *_cpython +qt_main: +- '5.15' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.5 +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml new file mode 100644 index 00000000..1f10a5f6 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -0,0 +1,64 @@ +build_variant: +- qt +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +expat: +- '2' +ffmpeg: +- '6' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.2 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libuuid: +- '2' +libxcb: +- '1.15' +libxml2: +- '2.11' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.0 +pugixml: +- '1.13' +python: +- 3.12.* *_cpython +sqlite: +- '3' +target_platform: +- linux-ppc64le +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.5 +zlib: +- '1.2' diff --git a/.ci_support/migrations/proj930.yaml b/.ci_support/migrations/proj930.yaml deleted file mode 100644 index 524717fb..00000000 --- a/.ci_support/migrations/proj930.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1693581350.7818532 -proj: -- 9.3.0 diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 00000000..b39b1bb1 --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,38 @@ +migrator_ts: 1695046563 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython + - 3.11.* *_cpython + - 3.12.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: false + longterm: True + pr_limit: 30 + max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.12.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.26 +python_impl: + - cpython diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml new file mode 100644 index 00000000..a18e3861 --- /dev/null +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -0,0 +1,64 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +build_variant: +- qt +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +expat: +- '2' +ffmpeg: +- '6' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.2 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2.11' +lz4_c: +- 1.9.3 +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.0 +pugixml: +- '1.13' +python: +- 3.12.* *_cpython +qt_main: +- '5.15' +sqlite: +- '3' +target_platform: +- osx-64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.5 +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml new file mode 100644 index 00000000..dfb13a38 --- /dev/null +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -0,0 +1,64 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +build_variant: +- qt +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +expat: +- '2' +ffmpeg: +- '6' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.2 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2.11' +lz4_c: +- 1.9.3 +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.0 +pugixml: +- '1.13' +python: +- 3.12.* *_cpython +qt_main: +- '5.15' +sqlite: +- '3' +target_platform: +- osx-arm64 +tbb: +- '2021' +tbb_devel: +- '2021' +tk: +- '8.6' +vtk: +- 9.2.5 +zlib: +- '1.2' diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml new file mode 100644 index 00000000..a0c83616 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -0,0 +1,56 @@ +build_variant: +- qt +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +expat: +- '2' +ffmpeg: +- '6' +freetype: +- '2' +glew: +- '2.1' +hdf5: +- 1.14.2 +jsoncpp: +- 1.9.5 +libjpeg_turbo: +- '3' +libnetcdf: +- 4.9.2 +libpng: +- '1.6' +libtiff: +- '4.6' +libxml2: +- '2.11' +lz4_c: +- 1.9.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +proj: +- 9.3.0 +pugixml: +- '1.13' +python: +- 3.12.* *_cpython +qt_main: +- '5.15' +sqlite: +- '3' +target_platform: +- win-64 +tbb: +- '2021' +tbb_devel: +- '2021' +vtk: +- 9.2.5 +zlib: +- '1.2' diff --git a/README.md b/README.md index ca02fb5c..d9727392 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,13 @@ Current build status variant + + linux_64_build_varianteglpython3.12.____cpython + + + variant + + linux_64_build_varianteglpython3.8.____cpython @@ -73,6 +80,13 @@ Current build status variant + + linux_64_build_variantosmesapython3.12.____cpython + + + variant + + linux_64_build_variantosmesapython3.8.____cpython @@ -101,6 +115,13 @@ Current build status variant + + linux_64_build_variantqtpython3.12.____cpython + + + variant + + linux_64_build_variantqtpython3.8.____cpython @@ -129,6 +150,13 @@ Current build status variant + + linux_aarch64_python3.12.____cpython + + + variant + + linux_aarch64_python3.8.____cpython @@ -157,6 +185,13 @@ Current build status variant + + linux_ppc64le_python3.12.____cpython + + + variant + + linux_ppc64le_python3.8.____cpython @@ -185,6 +220,13 @@ Current build status variant + + osx_64_python3.12.____cpython + + + variant + + osx_64_python3.8.____cpython @@ -213,6 +255,13 @@ Current build status variant + + osx_arm64_python3.12.____cpython + + + variant + + osx_arm64_python3.8.____cpython @@ -241,6 +290,13 @@ Current build status variant + + win_64_python3.12.____cpython + + + variant + + win_64_python3.8.____cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6605e2f6..121ff30c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "9.2.6" %} -{% set build = 17 %} +{% set build = 18 %} {% set minor_version = ".".join(version.split(".")[:2]) %}