diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e719ce4f..6c2fcacf 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -72,6 +72,7 @@ lz4_c: numpy: - '1.22' - '1.23' +- '1.26' - '1.22' - '1.22' openjpeg: @@ -95,6 +96,7 @@ proj: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython sqlite: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 1b4f12e9..761688c1 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -76,6 +76,7 @@ lz4_c: numpy: - '1.22' - '1.23' +- '1.26' - '1.22' - '1.22' openjpeg: @@ -99,6 +100,7 @@ proj: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython sqlite: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index d5a73a2b..87fd2025 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -72,6 +72,7 @@ lz4_c: numpy: - '1.22' - '1.23' +- '1.26' - '1.22' - '1.22' openjpeg: @@ -95,6 +96,7 @@ proj: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython sqlite: diff --git a/.ci_support/migrations/hdf51141.yaml b/.ci_support/migrations/hdf51141.yaml deleted file mode 100644 index ef6f947d..00000000 --- a/.ci_support/migrations/hdf51141.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -hdf5: -- 1.14.1 -migrator_ts: 1687165815.3104627 diff --git a/.ci_support/migrations/jpeg_to_libjpeg_turbo.yaml b/.ci_support/migrations/jpeg_to_libjpeg_turbo.yaml deleted file mode 100644 index dad138a3..00000000 --- a/.ci_support/migrations/jpeg_to_libjpeg_turbo.yaml +++ /dev/null @@ -1,15 +0,0 @@ -migrator_ts: 1678152141 -__migrator: - kind: version - migration_number: 3 - bump_number: 1 - commit_message: "Rebuild for jpegturbo migration" - paused: false - pr_limit: 10 - -libjpeg_turbo: - - 2.1.5 -# This migration is matched with a minimigrator that will -# replace jpeg with libjpegturbo -jpeg: - - 10 diff --git a/.ci_support/migrations/libarchive37.yaml b/.ci_support/migrations/libarchive37.yaml deleted file mode 100644 index e53cfbf0..00000000 --- a/.ci_support/migrations/libarchive37.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libarchive: -- '3.7' -migrator_ts: 1694554956.6608543 diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python312.yaml similarity index 74% rename from .ci_support/migrations/python311.yaml rename to .ci_support/migrations/python312.yaml index e4c79db1..b39b1bb1 100644 --- a/.ci_support/migrations/python311.yaml +++ b/.ci_support/migrations/python312.yaml @@ -1,4 +1,4 @@ -migrator_ts: 1666686085 +migrator_ts: 1695046563 __migrator: migration_number: 1 operation: key_add @@ -10,15 +10,16 @@ __migrator: - 3.8.* *_cpython - 3.9.* *_cpython - 3.10.* *_cpython - - 3.11.* *_cpython # new entry + - 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: 60 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times + 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 @@ -29,9 +30,9 @@ __migrator: exclude_pinned_pkgs: false python: - - 3.11.* *_cpython + - 3.12.* *_cpython # additional entries to add for zip_keys numpy: - - 1.23 + - 1.26 python_impl: - cpython diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 1060fe17..75bbcc29 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -8,7 +8,7 @@ arrow_cpp: c_compiler: - clang c_compiler_version: -- '15' +- '16' cfitsio: - 4.3.0 channel_sources: @@ -20,7 +20,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' geos: @@ -70,6 +70,7 @@ macos_machine: numpy: - '1.22' - '1.23' +- '1.26' - '1.22' - '1.22' openjpeg: @@ -93,6 +94,7 @@ proj: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython sqlite: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 58eafaac..8943d42f 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -8,7 +8,7 @@ arrow_cpp: c_compiler: - clang c_compiler_version: -- '15' +- '16' cfitsio: - 4.3.0 channel_sources: @@ -20,7 +20,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' expat: - '2' geos: @@ -70,6 +70,7 @@ macos_machine: numpy: - '1.22' - '1.23' +- '1.26' - '1.22' - '1.22' openjpeg: @@ -93,6 +94,7 @@ proj: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython sqlite: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index a584a6c7..67615325 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -58,6 +58,7 @@ lz4_c: numpy: - '1.22' - '1.23' +- '1.26' - '1.22' - '1.22' openjpeg: @@ -81,6 +82,7 @@ proj: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.12.* *_cpython - 3.8.* *_cpython - 3.9.* *_cpython sqlite: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 9d3031a5..5afc9c6d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,7 +34,7 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index cd9a88f2..870c49aa 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,7 +26,7 @@ conda activate base mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build boa conda-forge-ci-setup=3 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6fbb8065..1956f036 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: 40c0068591d2c711c699bbb734319398485ab169116ac28005d8302f80b923ad build: - number: 4 + number: 5 skip_compile_pyc: - share/bash-completion/completions/*.py