From c0a21e00a9aeaae25cfdf4e94210512ec06f6b11 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Oct 2022 03:48:39 +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 0000000..2dd1ff4 --- /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 b21e2a4..1f29000 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - use_external_spglib.patch build: - number: 4 + number: 5 skip: true # [win or py<35] requirements: From 32c89c173d16faabee0b221181ee5a8eaae703fb Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 28 Oct 2022 03:48:56 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.28.00.55.45 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +++++--- .azure-pipelines/azure-pipelines-osx.yml | 15 +++++--- ...ux_64_numpy1.20python3.8.____73_pypy.yaml} | 4 +- ...ux_64_numpy1.20python3.8.____cpython.yaml} | 2 +- ...nux_64_numpy1.20python3.9.____73_pypy.yaml | 31 +++++++++++++++ ...ux_64_numpy1.20python3.9.____cpython.yaml} | 2 +- .ci_support/migrations/boost1780.yaml | 9 ----- ...sx_64_numpy1.20python3.8.____73_pypy.yaml} | 4 +- ...sx_64_numpy1.20python3.8.____cpython.yaml} | 2 +- ...osx_64_numpy1.20python3.9.____73_pypy.yaml | 33 ++++++++++++++++ ...sx_64_numpy1.20python3.9.____cpython.yaml} | 2 +- README.md | 38 +++++++++++++------ 12 files changed, 117 insertions(+), 41 deletions(-) rename .ci_support/{linux_64_numpy1.19python3.7.____cpython.yaml => linux_64_numpy1.20python3.8.____73_pypy.yaml} (93%) rename .ci_support/{linux_64_numpy1.19python3.8.____cpython.yaml => linux_64_numpy1.20python3.8.____cpython.yaml} (97%) create mode 100644 .ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml rename .ci_support/{linux_64_numpy1.19python3.9.____cpython.yaml => linux_64_numpy1.20python3.9.____cpython.yaml} (97%) delete mode 100644 .ci_support/migrations/boost1780.yaml rename .ci_support/{osx_64_numpy1.19python3.7.____cpython.yaml => osx_64_numpy1.20python3.8.____73_pypy.yaml} (93%) rename .ci_support/{osx_64_numpy1.19python3.8.____cpython.yaml => osx_64_numpy1.20python3.8.____cpython.yaml} (97%) create mode 100644 .ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml rename .ci_support/{osx_64_numpy1.19python3.9.____cpython.yaml => osx_64_numpy1.20python3.9.____cpython.yaml} (97%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 79a0360..6e9b04d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.19python3.7.____cpython: - CONFIG: linux_64_numpy1.19python3.7.____cpython + linux_64_numpy1.20python3.8.____73_pypy: + CONFIG: linux_64_numpy1.20python3.8.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.19python3.8.____cpython: - CONFIG: linux_64_numpy1.19python3.8.____cpython + linux_64_numpy1.20python3.8.____cpython: + CONFIG: linux_64_numpy1.20python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.19python3.9.____cpython: - CONFIG: linux_64_numpy1.19python3.9.____cpython + linux_64_numpy1.20python3.9.____73_pypy: + CONFIG: linux_64_numpy1.20python3.9.____73_pypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.20python3.9.____cpython: + CONFIG: linux_64_numpy1.20python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.21python3.10.____cpython: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 3393d8a..33a132d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,14 +8,17 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.19python3.7.____cpython: - CONFIG: osx_64_numpy1.19python3.7.____cpython + osx_64_numpy1.20python3.8.____73_pypy: + CONFIG: osx_64_numpy1.20python3.8.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.8.____cpython: - CONFIG: osx_64_numpy1.19python3.8.____cpython + osx_64_numpy1.20python3.8.____cpython: + CONFIG: osx_64_numpy1.20python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.9.____cpython: - CONFIG: osx_64_numpy1.19python3.9.____cpython + osx_64_numpy1.20python3.9.____73_pypy: + CONFIG: osx_64_numpy1.20python3.9.____73_pypy + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.20python3.9.____cpython: + CONFIG: osx_64_numpy1.20python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.21python3.10.____cpython: CONFIG: osx_64_numpy1.21python3.10.____cpython diff --git a/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml similarity index 93% rename from .ci_support/linux_64_numpy1.19python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml index 3e4fd7c..9e10cf9 100644 --- a/.ci_support/linux_64_numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml @@ -15,7 +15,7 @@ docker_image: liblapack: - 3.9 *netlib numpy: -- '1.19' +- '1.20' pin_run_as_build: boost: max_pin: x.x.x @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.8.* *_73_pypy target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy1.19python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml index 485e11b..b68e1d3 100644 --- a/.ci_support/linux_64_numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml @@ -15,7 +15,7 @@ docker_image: liblapack: - 3.9 *netlib numpy: -- '1.19' +- '1.20' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml new file mode 100644 index 0000000..66cad46 --- /dev/null +++ b/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml @@ -0,0 +1,31 @@ +boost: +- 1.78.0 +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +liblapack: +- 3.9 *netlib +numpy: +- '1.20' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +target_platform: +- linux-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml index 980006c..5be7b5c 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml @@ -15,7 +15,7 @@ docker_image: liblapack: - 3.9 *netlib numpy: -- '1.19' +- '1.20' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/migrations/boost1780.yaml b/.ci_support/migrations/boost1780.yaml deleted file mode 100644 index 9933373..0000000 --- a/.ci_support/migrations/boost1780.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 3 -boost: -- 1.78.0 -boost_cpp: -- 1.78.0 -migrator_ts: 1662825971 diff --git a/.ci_support/osx_64_numpy1.19python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml similarity index 93% rename from .ci_support/osx_64_numpy1.19python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml index bb8edc7..8a8a961 100644 --- a/.ci_support/osx_64_numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.19' +- '1.20' pin_run_as_build: boost: max_pin: x.x.x @@ -25,7 +25,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.8.* *_73_pypy target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_numpy1.19python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy1.19python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.20python3.8.____cpython.yaml index 02fea7b..7f62fba 100644 --- a/.ci_support/osx_64_numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.19' +- '1.20' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml new file mode 100644 index 0000000..36457a0 --- /dev/null +++ b/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml @@ -0,0 +1,33 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +boost: +- 1.78.0 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '14' +liblapack: +- 3.9 *netlib +llvm_openmp: +- '14' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.20' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +target_platform: +- osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml similarity index 97% rename from .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml index 23732d3..95254e1 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml @@ -17,7 +17,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.19' +- '1.20' pin_run_as_build: boost: max_pin: x.x.x diff --git a/README.md b/README.md index a29107e..74a4d48 100644 --- a/README.md +++ b/README.md @@ -37,24 +37,31 @@ Current build status - + - + - + + + + @@ -65,24 +72,31 @@ Current build status - + + + + - + - +
VariantStatus
linux_64_numpy1.19python3.7.____cpythonlinux_64_numpy1.20python3.8.____73_pypy - variant + variant
linux_64_numpy1.19python3.8.____cpythonlinux_64_numpy1.20python3.8.____cpython - variant + variant
linux_64_numpy1.19python3.9.____cpythonlinux_64_numpy1.20python3.9.____73_pypy - variant + variant + +
linux_64_numpy1.20python3.9.____cpython + + variant
osx_64_numpy1.19python3.7.____cpythonosx_64_numpy1.20python3.8.____73_pypy + + variant + +
osx_64_numpy1.20python3.8.____cpython - variant + variant
osx_64_numpy1.19python3.8.____cpythonosx_64_numpy1.20python3.9.____73_pypy - variant + variant
osx_64_numpy1.19python3.9.____cpythonosx_64_numpy1.20python3.9.____cpython - variant + variant