From 73f162bbffe5c743daea32bba4f6b118297aeb71 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 2 Feb 2024 23:49:02 +0000 Subject: [PATCH 1/5] Rebuild for python312 --- .ci_support/migrations/python312.yaml | 38 +++++++++++++++++++++++++++ conda-forge.yml | 4 +-- recipe/meta.yaml | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 0000000..b39b1bb --- /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/conda-forge.yml b/conda-forge.yml index 6c7a233..0828bfb 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,6 +2,8 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main @@ -11,5 +13,3 @@ provider: linux_ppc64le: default win: azure test_on_native_only: true -conda_build: - pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a4c8026..678b509 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 skip: true # [py<39] script_env: - PY_VCRUNTIME_REDIST From 9f2a0f27fcb5565161a3c8fe84c4fb085cf54103 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 2 Feb 2024 23:49:17 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.02.14.47.44 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++++++ .azure-pipelines/azure-pipelines-osx.yml | 6 +++ .azure-pipelines/azure-pipelines-win.yml | 3 ++ .../linux_64_python3.12.____cpython.yaml | 29 +++++++++++++ .../linux_aarch64_python3.12.____cpython.yaml | 33 +++++++++++++++ .../linux_ppc64le_python3.12.____cpython.yaml | 29 +++++++++++++ .../osx_64_python3.12.____cpython.yaml | 29 +++++++++++++ .../osx_arm64_python3.12.____cpython.yaml | 29 +++++++++++++ .../win_64_python3.12.____cpython.yaml | 18 ++++++++ README.md | 42 +++++++++++++++++++ 10 files changed, 230 insertions(+) create mode 100644 .ci_support/linux_64_python3.12.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_python3.12.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_python3.12.____cpython.yaml create mode 100644 .ci_support/win_64_python3.12.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 759f83f..0a511d8 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,6 +16,10 @@ jobs: CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.12.____cpython: + CONFIG: linux_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.9.____73_pypy: CONFIG: linux_64_python3.9.____73_pypy UPLOAD_PACKAGES: 'True' @@ -32,6 +36,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.9.____73_pypy: CONFIG: linux_aarch64_python3.9.____73_pypy UPLOAD_PACKAGES: 'True' @@ -48,6 +56,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.9.____73_pypy: CONFIG: linux_ppc64le_python3.9.____73_pypy UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 09bf329..da2d545 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.9.____73_pypy: CONFIG: osx_64_python3.9.____73_pypy 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.9.____cpython: CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 3694144..1b9fa79 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.9.____73_pypy: CONFIG: win_64_python3.9.____73_pypy UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml new file mode 100644 index 0000000..2341ed8 --- /dev/null +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -0,0 +1,29 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +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 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_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 0000000..f8d5ac7 --- /dev/null +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -0,0 +1,33 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +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 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +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 0000000..d5820d5 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -0,0 +1,29 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +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 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' 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 0000000..59743c7 --- /dev/null +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -0,0 +1,29 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +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 0000000..2080410 --- /dev/null +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -0,0 +1,29 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +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 0000000..cf09f13 --- /dev/null +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -0,0 +1,18 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +target_platform: +- win-64 +zlib: +- '1.2' diff --git a/README.md b/README.md index d1f61da..13ad531 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,13 @@ Current build status variant + + linux_64_python3.12.____cpython + + + variant + + linux_64_python3.9.____73_pypy @@ -72,6 +79,13 @@ Current build status variant + + linux_aarch64_python3.12.____cpython + + + variant + + linux_aarch64_python3.9.____73_pypy @@ -100,6 +114,13 @@ Current build status variant + + linux_ppc64le_python3.12.____cpython + + + variant + + linux_ppc64le_python3.9.____73_pypy @@ -128,6 +149,13 @@ Current build status variant + + osx_64_python3.12.____cpython + + + variant + + osx_64_python3.9.____73_pypy @@ -156,6 +184,13 @@ Current build status variant + + osx_arm64_python3.12.____cpython + + + variant + + osx_arm64_python3.9.____cpython @@ -177,6 +212,13 @@ Current build status variant + + win_64_python3.12.____cpython + + + variant + + win_64_python3.9.____73_pypy From 90adab8d09c809ab4899c90bf912184aa3ebd3d6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 29 Sep 2023 16:29:11 +0200 Subject: [PATCH 3/5] echon on --- recipe/bld.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 31131a5..f6b06ff 100755 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,3 +1,5 @@ +@echo on + @rem Let CMake know about the LLVM install path, for find_package() set CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% set "LLVM_CONFIG=%LIBRARY_PREFIX%\bin\llvm_config.exe" From 40fb7e12fb9a5460cfd05bdcf04daf3cb779bf4c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 23 Jan 2024 18:38:38 -0800 Subject: [PATCH 4/5] Drop `-S` from Python install --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index f6b06ff..39c07fa 100755 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -18,7 +18,7 @@ if exist ffi\build rmdir /S /Q ffi\build llvm-config.exe --libs -%PYTHON% -S setup.py install +%PYTHON% setup.py install if errorlevel 1 exit 1 %PYTHON% runtests.py From d8632dc9e658aa9e8f32c86adea5043b69e6958a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 2 Feb 2024 16:29:01 -0800 Subject: [PATCH 5/5] Refresh PyPy migrator --- .ci_support/migrations/pypy38.yaml | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml index 5f2d1a0..065dae6 100644 --- a/.ci_support/migrations/pypy38.yaml +++ b/.ci_support/migrations/pypy38.yaml @@ -1,6 +1,7 @@ migrator_ts: 1647123563 __migrator: migration_number: 1 + operation: key_add primary_key: python ordering: python: @@ -9,6 +10,7 @@ __migrator: - 3.8.* *_cpython - 3.9.* *_cpython - 3.10.* *_cpython + - 3.11.* *_cpython - 3.6.* *_73_pypy - 3.7.* *_73_pypy - 3.8.* *_73_pypy @@ -18,36 +20,22 @@ __migrator: use_local: False check_solvable: True exclude_pinned_pkgs: False - pr_limit: 1 + pr_limit: 10 bump_number: 1 - wait_for_migrators: - - python310 - commit_message: "Rebuild for PyPy3.8 and PyPy3.9" + commit_message: "Rebuild for PyPy3.9" exclude: # this shouldn't attempt to modify the python feedstocks - python - pypy3.6 - pypy-meta + ignored_deps_per_node: + matplotlib: + - pyqt python: - - 3.7.* *_cpython # [not (osx and arm64)] - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.8.* *_73_pypy # [not (osx and arm64)] - 3.9.* *_73_pypy # [not (osx and arm64)] numpy: # part of a zip_keys: python, python_impl, numpy - - 1.19 # [not (osx and arm64)] - - 1.19 - - 1.19 - - 1.21 - - 1.22 # [not (osx and arm64)] - 1.22 # [not (osx and arm64)] python_impl: - - cpython # [not (osx and arm64)] - - cpython - - cpython - - cpython - - pypy # [not (osx and arm64)] - pypy # [not (osx and arm64)]