From e7328f6e4cc970f0efc30a07e1e03b679fcd8964 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 2 Nov 2022 08:16:34 +0000 Subject: [PATCH 1/2] 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..2715ab2 --- /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: 10 # this will make the bot retry "not solvable" stuff 10 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 1f29000..35636e6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - use_external_spglib.patch build: - number: 5 + number: 6 skip: true # [win or py<35] requirements: From 8e0fc55c0ef701e63992b809ecd773fa5e18faf7 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 2 Nov 2022 08:17:04 +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 | 4 +++ .azure-pipelines/azure-pipelines-osx.yml | 3 ++ ...ux_64_numpy1.23python3.11.____cpython.yaml | 31 +++++++++++++++++ ...sx_64_numpy1.23python3.11.____cpython.yaml | 33 ++++++++++++++++++ .circleci/config.yml | 2 +- .github/workflows/automerge.yml | 2 +- .scripts/build_steps.sh | 4 +-- .scripts/run_osx_build.sh | 5 ++- README.md | 34 +++++++++++++------ 9 files changed, 101 insertions(+), 17 deletions(-) create mode 100644 .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml create mode 100644 .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6e9b04d..9a99e7a 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -28,6 +28,10 @@ jobs: CONFIG: linux_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.23python3.11.____cpython: + CONFIG: linux_64_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 33a132d..ddd9634 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -23,6 +23,9 @@ jobs: osx_64_numpy1.21python3.10.____cpython: CONFIG: osx_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' + osx_64_numpy1.23python3.11.____cpython: + CONFIG: osx_64_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..5e8b12c --- /dev/null +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.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.23' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml new file mode 100644 index 0000000..8efecbf --- /dev/null +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.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.23' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- osx-64 +zip_keys: +- - python + - numpy 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/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 773b3d1..da1368a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,7 +10,7 @@ jobs: name: automerge steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 595f8b5..71a4242 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 07de621..caa788e 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 74a4d48..a80ce95 100644 --- a/README.md +++ b/README.md @@ -40,70 +40,84 @@ Current build status linux_64_numpy1.20python3.8.____73_pypy - variant + variant linux_64_numpy1.20python3.8.____cpython - variant + variant linux_64_numpy1.20python3.9.____73_pypy - variant + variant linux_64_numpy1.20python3.9.____cpython - variant + variant linux_64_numpy1.21python3.10.____cpython - variant + variant + + + + linux_64_numpy1.23python3.11.____cpython + + + variant osx_64_numpy1.20python3.8.____73_pypy - variant + variant osx_64_numpy1.20python3.8.____cpython - variant + variant osx_64_numpy1.20python3.9.____73_pypy - variant + variant osx_64_numpy1.20python3.9.____cpython - variant + variant osx_64_numpy1.21python3.10.____cpython - variant + variant + + + + osx_64_numpy1.23python3.11.____cpython + + + variant