From 693cf32b376c3a1c061d9c1492a7415a97848aab Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 1 Nov 2022 23:39:18 +0000 Subject: [PATCH 1/2] Rebuild for PyPy3.8 and PyPy3.9 --- .ci_support/migrations/pypy38.yaml | 43 ++++++++++++++++++++++++++++++ conda-forge.yml | 9 ++++--- recipe/meta.yaml | 2 +- 3 files changed, 49 insertions(+), 5 deletions(-) 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/conda-forge.yml b/conda-forge.yml index 16ebdf3..830d1ac 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,9 @@ -provider: - win: azure +build_platform: + osx_arm64: osx_64 conda_forge_output_validation: true -build_platform: {osx_arm64: osx_64} -test_on_native_only: true github: branch_name: main tooling_branch_name: main +provider: + win: azure +test_on_native_only: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b525b6c..4de825c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 9aba19855e6b23c36e18a9462ad319ad11a7c222d33341ae21a5669840e5018d build: - number: 1 + number: 2 script: {{ PYTHON }} -m pip install . --no-deps -vv requirements: From 73c9064071c0960465bfa9145571891f44c00003 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 1 Nov 2022 23:39:40 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.3, and conda-forge-pinning 2022.11.01.22.10.41 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++ .azure-pipelines/azure-pipelines-osx.yml | 6 +++ .azure-pipelines/azure-pipelines-win.yml | 6 +++ .../linux_64_python3.8.____73_pypy.yaml | 29 +++++++++++++ .../linux_64_python3.9.____73_pypy.yaml | 29 +++++++++++++ .ci_support/osx_64_python3.8.____73_pypy.yaml | 29 +++++++++++++ .ci_support/osx_64_python3.9.____73_pypy.yaml | 29 +++++++++++++ .ci_support/win_64_python3.8.____73_pypy.yaml | 18 ++++++++ .ci_support/win_64_python3.9.____73_pypy.yaml | 18 ++++++++ README.md | 42 +++++++++++++++++++ 10 files changed, 214 insertions(+) create mode 100644 .ci_support/linux_64_python3.8.____73_pypy.yaml create mode 100644 .ci_support/linux_64_python3.9.____73_pypy.yaml create mode 100644 .ci_support/osx_64_python3.8.____73_pypy.yaml create mode 100644 .ci_support/osx_64_python3.9.____73_pypy.yaml create mode 100644 .ci_support/win_64_python3.8.____73_pypy.yaml create mode 100644 .ci_support/win_64_python3.9.____73_pypy.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5e79a1a..dcb0f13 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,10 +16,18 @@ jobs: CONFIG: linux_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.8.____73_pypy: + CONFIG: linux_64_python3.8.____73_pypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.8.____cpython: CONFIG: linux_64_python3.8.____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' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.9.____cpython: CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 052ccf0..79d3965 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,9 +14,15 @@ jobs: osx_64_python3.11.____cpython: CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_python3.8.____73_pypy: + CONFIG: osx_64_python3.8.____73_pypy + UPLOAD_PACKAGES: 'True' osx_64_python3.8.____cpython: CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' + osx_64_python3.9.____73_pypy: + CONFIG: osx_64_python3.9.____73_pypy + UPLOAD_PACKAGES: 'True' osx_64_python3.9.____cpython: CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8e3f559..088335b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,9 +14,15 @@ jobs: win_64_python3.11.____cpython: CONFIG: win_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' + win_64_python3.8.____73_pypy: + CONFIG: win_64_python3.8.____73_pypy + UPLOAD_PACKAGES: 'True' win_64_python3.8.____cpython: CONFIG: win_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' + win_64_python3.9.____73_pypy: + CONFIG: win_64_python3.9.____73_pypy + UPLOAD_PACKAGES: 'True' win_64_python3.9.____cpython: CONFIG: win_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_python3.8.____73_pypy.yaml b/.ci_support/linux_64_python3.8.____73_pypy.yaml new file mode 100644 index 0000000..6bc30b6 --- /dev/null +++ b/.ci_support/linux_64_python3.8.____73_pypy.yaml @@ -0,0 +1,29 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +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 +freetype: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml new file mode 100644 index 0000000..5d91622 --- /dev/null +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -0,0 +1,29 @@ +c_compiler: +- gcc +c_compiler_version: +- '10' +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 +freetype: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml new file mode 100644 index 0000000..2d70c90 --- /dev/null +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -0,0 +1,29 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '14' +freetype: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml new file mode 100644 index 0000000..2b793c0 --- /dev/null +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -0,0 +1,29 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '14' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '14' +freetype: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/win_64_python3.8.____73_pypy.yaml b/.ci_support/win_64_python3.8.____73_pypy.yaml new file mode 100644 index 0000000..115c69f --- /dev/null +++ b/.ci_support/win_64_python3.8.____73_pypy.yaml @@ -0,0 +1,18 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +freetype: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_73_pypy +target_platform: +- win-64 diff --git a/.ci_support/win_64_python3.9.____73_pypy.yaml b/.ci_support/win_64_python3.9.____73_pypy.yaml new file mode 100644 index 0000000..9490bd7 --- /dev/null +++ b/.ci_support/win_64_python3.9.____73_pypy.yaml @@ -0,0 +1,18 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +freetype: +- '2' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_73_pypy +target_platform: +- win-64 diff --git a/README.md b/README.md index e3e855d..67ae71b 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,13 @@ Current build status variant + + linux_64_python3.8.____73_pypy + + + variant + + linux_64_python3.8.____cpython @@ -51,6 +58,13 @@ Current build status variant + + linux_64_python3.9.____73_pypy + + + variant + + linux_64_python3.9.____cpython @@ -72,6 +86,13 @@ Current build status variant + + osx_64_python3.8.____73_pypy + + + variant + + osx_64_python3.8.____cpython @@ -79,6 +100,13 @@ Current build status variant + + osx_64_python3.9.____73_pypy + + + variant + + osx_64_python3.9.____cpython @@ -128,6 +156,13 @@ Current build status variant + + win_64_python3.8.____73_pypy + + + variant + + win_64_python3.8.____cpython @@ -135,6 +170,13 @@ Current build status variant + + win_64_python3.9.____73_pypy + + + variant + + win_64_python3.9.____cpython