From e957395ceb3aee7d10afd7e84605e5218dc9d345 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 16:33:36 +0000 Subject: [PATCH 1/2] Rebuild for PyPy3.8 and PyPy3.9 --- .ci_support/migrations/pypy38.yaml | 43 ++++++++++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/pypy38.yaml diff --git a/.ci_support/migrations/pypy38.yaml b/.ci_support/migrations/pypy38.yaml new file mode 100644 index 00000000..2dd1ff4a --- /dev/null +++ b/.ci_support/migrations/pypy38.yaml @@ -0,0 +1,43 @@ +migrator_ts: 1647123563 +__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.6.* *_73_pypy + - 3.7.* *_73_pypy + - 3.8.* *_73_pypy + - 3.9.* *_73_pypy + paused: False + longterm: True + use_local: False + check_solvable: True + exclude_pinned_pkgs: False + pr_limit: 10 + bump_number: 1 + commit_message: "Rebuild for PyPy3.8 and 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.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.20 # [not (osx and arm64)] + - 1.20 # [not (osx and arm64)] +python_impl: + - pypy # [not (osx and arm64)] + - pypy # [not (osx and arm64)] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 98507c2e..dfeb2a89 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -92,7 +92,7 @@ source: - patches/0006-add-bigobj-to-swigfaiss-compile-options-on-windows.patch build: - number: 3 + number: 4 skip: true # [linux and cuda_compiler_version == "10.2"] # always crashes skip: true # [win and cuda_compiler_version in ("11.0", "11.1")] From ff2ee978e280ad24df8955fd2f82ecaef8e03c5f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 6 Jan 2023 16:37:14 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.01.04.13.03.46 --- ...nux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml | 4 ++++ ...ux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml | 4 ++++ ...ux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml | 4 ++++ ...ux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml | 4 ++++ .ci_support/linux_aarch64_.yaml | 4 ++++ .ci_support/linux_ppc64le_.yaml | 4 ++++ .ci_support/osx_64_.yaml | 4 ++++ .ci_support/win_64_cuda_compiler_version10.2.yaml | 4 ++++ .ci_support/win_64_cuda_compiler_version11.2.yaml | 4 ++++ .ci_support/win_64_cuda_compiler_versionNone.yaml | 4 ++++ 10 files changed, 40 insertions(+) diff --git a/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml b/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml index 7eefee4c..2f76c309 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.0cxx_compiler_version9.yaml @@ -23,6 +23,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -30,7 +32,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml b/.ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml index 6cc1a9d9..d6d5310c 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.1cxx_compiler_version10.yaml @@ -23,6 +23,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -30,7 +32,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml index 4908fc37..5651a1c6 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10.yaml @@ -23,6 +23,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -30,7 +32,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml index c1b75d1b..7907d430 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version11.yaml @@ -23,6 +23,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -30,7 +32,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 7467bc0a..bc2c1757 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -27,6 +27,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -34,7 +36,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - linux-aarch64 diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index d0f60e38..e39ffdfa 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -23,6 +23,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -30,7 +32,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - linux-ppc64le diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a577f451..0170a033 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -23,6 +23,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -30,7 +32,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - osx-64 diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml index 299bc979..df84e07b 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.2.yaml @@ -17,6 +17,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -24,7 +26,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - win-64 diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml index 444531a5..bc87c26b 100644 --- a/.ci_support/win_64_cuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -17,6 +17,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -24,7 +26,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - win-64 diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index d41d0316..7974933a 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -17,6 +17,8 @@ numpy: - '1.23' - '1.20' - '1.20' +- '1.20' +- '1.20' pin_run_as_build: python: min_pin: x.x @@ -24,7 +26,9 @@ pin_run_as_build: python: - 3.10.* *_cpython - 3.11.* *_cpython +- 3.8.* *_73_pypy - 3.8.* *_cpython +- 3.9.* *_73_pypy - 3.9.* *_cpython target_platform: - win-64