From f553067344f7cdbd685a634bd6a77ff96a3f289a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 4 Nov 2022 01:00:12 +0000 Subject: [PATCH 1/3] Rebuild for python311 --- .ci_support/migrations/python311.yaml | 37 +++++++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/python311.yaml diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml new file mode 100644 index 0000000..be186d2 --- /dev/null +++ b/.ci_support/migrations/python311.yaml @@ -0,0 +1,37 @@ +migrator_ts: 1666686085 +__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 # 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: 12 # this will make the bot retry "not solvable" stuff 12 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.11.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.23 +python_impl: + - cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1cea2b4..449896a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,7 @@ source: - gh9946_utf_16_replacement.patch build: - number: 1 + number: 2 # These are present when the new environment is created # so we have to exempt them from the list of initial files # for conda-build to realize they should be included. From cf1d2217ea1467ef052e67f20e1e09c011b6e52f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 4 Nov 2022 01:00:41 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.3, and conda-forge-pinning 2022.11.03.19.49.57 --- .azure-pipelines/azure-pipelines-linux.yml | 12 +-- .azure-pipelines/azure-pipelines-osx.yml | 7 +- .azure-pipelines/azure-pipelines-win.yml | 6 +- ...on3.11.____cpythonpython_implcpython.yaml} | 2 +- ...on3.11.____cpythonpython_implcpython.yaml} | 2 +- ...on3.11.____cpythonpython_implcpython.yaml} | 2 +- ...on3.11.____cpythonpython_implcpython.yaml} | 2 +- .../osx_arm64_python3.11.____cpython.yaml | 21 +++++ ...on3.11.____cpythonpython_implcpython.yaml} | 2 +- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 +- .scripts/run_osx_build.sh | 5 +- README.md | 83 ++++++++++--------- 13 files changed, 90 insertions(+), 60 deletions(-) rename .ci_support/{linux_64_python3.7.____cpythonpython_implcpython.yaml => linux_64_python3.11.____cpythonpython_implcpython.yaml} (94%) rename .ci_support/{linux_aarch64_python3.7.____cpythonpython_implcpython.yaml => linux_aarch64_python3.11.____cpythonpython_implcpython.yaml} (95%) rename .ci_support/{linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml => linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml} (94%) rename .ci_support/{osx_64_python3.7.____cpythonpython_implcpython.yaml => osx_64_python3.11.____cpythonpython_implcpython.yaml} (94%) create mode 100644 .ci_support/osx_arm64_python3.11.____cpython.yaml rename .ci_support/{win_64_python3.7.____cpythonpython_implcpython.yaml => win_64_python3.11.____cpythonpython_implcpython.yaml} (92%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3c73d7b..798d76f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,8 +12,8 @@ jobs: CONFIG: linux_64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.7.____cpythonpython_implcpython: - CONFIG: linux_64_python3.7.____cpythonpython_implcpython + linux_64_python3.11.____cpythonpython_implcpython: + CONFIG: linux_64_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.8.____73_pypypython_implpypy: @@ -36,8 +36,8 @@ jobs: CONFIG: linux_aarch64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.7.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.7.____cpythonpython_implcpython + linux_aarch64_python3.11.____cpythonpython_implcpython: + CONFIG: linux_aarch64_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.8.____73_pypypython_implpypy: @@ -60,8 +60,8 @@ jobs: CONFIG: linux_ppc64le_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.7.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_python3.7.____cpythonpython_implcpython + linux_ppc64le_python3.11.____cpythonpython_implcpython: + CONFIG: linux_ppc64le_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_python3.8.____73_pypypython_implpypy: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a87d85b..4fcaddc 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,8 +11,8 @@ jobs: osx_64_python3.10.____cpythonpython_implcpython: CONFIG: osx_64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpythonpython_implcpython: - CONFIG: osx_64_python3.7.____cpythonpython_implcpython + osx_64_python3.11.____cpythonpython_implcpython: + CONFIG: osx_64_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_64_python3.8.____73_pypypython_implpypy: CONFIG: osx_64_python3.8.____73_pypypython_implpypy @@ -29,6 +29,9 @@ jobs: osx_arm64_python3.10.____cpython: CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_python3.8.____cpython: CONFIG: osx_arm64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c1c67ec..61cc452 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,8 +11,8 @@ jobs: win_64_python3.10.____cpythonpython_implcpython: CONFIG: win_64_python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_python3.7.____cpythonpython_implcpython: - CONFIG: win_64_python3.7.____cpythonpython_implcpython + win_64_python3.11.____cpythonpython_implcpython: + CONFIG: win_64_python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' win_64_python3.8.____73_pypypython_implpypy: CONFIG: win_64_python3.8.____73_pypypython_implpypy @@ -50,7 +50,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml similarity index 94% rename from .ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml index 3004fbb..31555c1 100644 --- a/.ci_support/linux_64_python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.11.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml similarity index 95% rename from .ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml index 0a01d74..bd6e6c6 100644 --- a/.ci_support/linux_aarch64_python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml @@ -15,7 +15,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.11.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml similarity index 94% rename from .ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml index ade06e7..86b338c 100644 --- a/.ci_support/linux_ppc64le_python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.11.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml similarity index 94% rename from .ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml index 5272f45..c130e13 100644 --- a/.ci_support/osx_64_python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml @@ -11,7 +11,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.11.* *_cpython python_impl: - cpython target_platform: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml new file mode 100644 index 0000000..c592c11 --- /dev/null +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -0,0 +1,21 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +python_impl: +- cpython +target_platform: +- osx-arm64 +zip_keys: +- - python + - python_impl diff --git a/.ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml index 53d2243..dfd7234 100644 --- a/.ci_support/win_64_python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml @@ -7,7 +7,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.11.* *_cpython python_impl: - cpython target_platform: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..84431a6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # 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 736a39a..b3abaeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index 2bedd7e..dea942f 100644 --- a/README.md +++ b/README.md @@ -37,231 +37,238 @@ Current build status linux_64_python3.10.____cpythonpython_implcpython - variant + variant - linux_64_python3.7.____cpythonpython_implcpython + linux_64_python3.11.____cpythonpython_implcpython - variant + variant linux_64_python3.8.____73_pypypython_implpypy - variant + variant linux_64_python3.8.____cpythonpython_implcpython - variant + variant linux_64_python3.9.____73_pypypython_implpypy - variant + variant linux_64_python3.9.____cpythonpython_implcpython - variant + variant linux_aarch64_python3.10.____cpythonpython_implcpython - variant + variant - linux_aarch64_python3.7.____cpythonpython_implcpython + linux_aarch64_python3.11.____cpythonpython_implcpython - variant + variant linux_aarch64_python3.8.____73_pypypython_implpypy - variant + variant linux_aarch64_python3.8.____cpythonpython_implcpython - variant + variant linux_aarch64_python3.9.____73_pypypython_implpypy - variant + variant linux_aarch64_python3.9.____cpythonpython_implcpython - variant + variant linux_ppc64le_python3.10.____cpythonpython_implcpython - variant + variant - linux_ppc64le_python3.7.____cpythonpython_implcpython + linux_ppc64le_python3.11.____cpythonpython_implcpython - variant + variant linux_ppc64le_python3.8.____73_pypypython_implpypy - variant + variant linux_ppc64le_python3.8.____cpythonpython_implcpython - variant + variant linux_ppc64le_python3.9.____73_pypypython_implpypy - variant + variant linux_ppc64le_python3.9.____cpythonpython_implcpython - variant + variant osx_64_python3.10.____cpythonpython_implcpython - variant + variant - osx_64_python3.7.____cpythonpython_implcpython + osx_64_python3.11.____cpythonpython_implcpython - variant + variant osx_64_python3.8.____73_pypypython_implpypy - variant + variant osx_64_python3.8.____cpythonpython_implcpython - variant + variant osx_64_python3.9.____73_pypypython_implpypy - variant + variant osx_64_python3.9.____cpythonpython_implcpython - variant + variant osx_arm64_python3.10.____cpython - variant + variant + + + + osx_arm64_python3.11.____cpython + + + variant osx_arm64_python3.8.____cpython - variant + variant osx_arm64_python3.9.____cpython - variant + variant win_64_python3.10.____cpythonpython_implcpython - variant + variant - win_64_python3.7.____cpythonpython_implcpython + win_64_python3.11.____cpythonpython_implcpython - variant + variant win_64_python3.8.____73_pypypython_implpypy - variant + variant win_64_python3.8.____cpythonpython_implcpython - variant + variant win_64_python3.9.____73_pypypython_implpypy - variant + variant win_64_python3.9.____cpythonpython_implcpython - variant + variant From 856df5aa64926c541961e9a324d9f107031466ce Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 4 Nov 2022 12:01:02 -0700 Subject: [PATCH 3/3] Skip `conda-smithy` downstream test on Python 3.11 Since we need to get `conda` out first, skip the downstream test on Python 3.11. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 449896a..252227a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -85,7 +85,7 @@ test: - commands_to_test.bat # [win] - commands_to_test.sh # [unix] downstreams: - - conda-smithy # [python_impl == "cpython"] + - conda-smithy # [python_impl == "cpython" and py<311] commands: - env run_pytest={{ run_pytest }} bash test_runner.sh # [unix] - set run_pytest={{ run_pytest }} && .\test_runner.bat # [win]