From 166536358ef4baa9d3545207dbe3a9ba3e9786c5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 14 Jul 2024 19:31:19 +0000 Subject: [PATCH 1/4] Rebuild for numpy 2.0 TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot PR has updated the recipe to account for the changes (see below for details). The biggest change is that we no longer need to use the oldest available numpy version at build time in order to support old numpy version at runtime - numpy will by default use a compatible ABI for the oldest still-supported numpy versions. Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a run requirement - this has been handled for more than two years now by a run-export on the numpy package itself. The migrator will therefore remove any occurrences of this. However, by default, building against numpy 2.0 will assume that the package is compatible with numpy 2.0, which is not necessarily the case. You should check that the upstream package explicitly supports numpy 2.0, otherwise you need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy issue 26191 for an overview of the most important packages). ### To-Dos: * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`. * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. PS. If the build does not compile anymore, this is almost certainly a sign that the upstream project is not yet ready for numpy 2.0; do not close this PR until a version compatible with numpy 2.0 has been released upstream and on this feedstock (in the meantime, you can keep the bot from reopening this PR in case of git conflicts by marking it as a draft). --- .ci_support/migrations/numpy2.yaml | 48 ++++++++++++++++++++++++++++++ recipe/meta.yaml | 3 +- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 .ci_support/migrations/numpy2.yaml diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 0000000..4e6d3ca --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,48 @@ +__migrator: + build_number: 1 + kind: version + commit_message: | + Rebuild for numpy 2.0 + + TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot + PR has updated the recipe to account for the changes (see below for details). + + The biggest change is that we no longer need to use the oldest available numpy + version at build time in order to support old numpy version at runtime - numpy + will by default use a compatible ABI for the oldest still-supported numpy versions. + + Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a + run requirement - this has been handled for more than two years now by a + run-export on the numpy package itself. The migrator will therefore remove + any occurrences of this. + + However, by default, building against numpy 2.0 will assume that the package + is compatible with numpy 2.0, which is not necessarily the case. You should + check that the upstream package explicitly supports numpy 2.0, otherwise you + need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy + issue 26191 for an overview of the most important packages). + + ### To-Dos: + * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) + * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`. + * If upstream is already compatible with numpy 2.0, nothing else should be necessary in most cases. + * If upstream requires a minimum numpy version newer than 1.19, you can add `numpy >=x.y` under `run:`. + * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. + + PS. If the build does not compile anymore, this is almost certainly a sign that + the upstream project is not yet ready for numpy 2.0; do not close this PR until + a version compatible with numpy 2.0 has been released upstream and on this + feedstock (in the meantime, you can keep the bot from reopening this PR in + case of git conflicts by marking it as a draft). + + migration_number: 1 + +# needs to match length of zip {python, python_impl, numpy} +# as it is in global CBC in order to override it +numpy: + - 1.22 # no py38 support for numpy 2.0 + - 2.0 + - 2.0 + - 2.0 + - 2.0 +migrator_ts: 1713572489.295986 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d0a5438..ca8737f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: sha256: {{ sha256 }} build: - number: 0 + number: 1 skip: true # [python_impl == 'pypy'] script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv # [not win] script: set PHONOPY_USE_OMP=OFF && {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv # [win] @@ -48,7 +48,6 @@ requirements: - setuptools_scm run: - python - - {{ pin_compatible('numpy') }} - spglib - matplotlib-base - h5py From 2bb0e85fd4116c6aae7a53ad46e22353ff8c376f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 14 Jul 2024 19:32:38 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.14.16.05.21 --- .azure-pipelines/azure-pipelines-linux.yml | 20 ++--- .azure-pipelines/azure-pipelines-osx.yml | 34 ++++----- .azure-pipelines/azure-pipelines-win.yml | 18 ++--- ...on3.10.____cpythonpython_implcpython.yaml} | 2 +- ...on3.11.____cpythonpython_implcpython.yaml} | 2 +- ...on3.12.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 2 +- ...on3.10.____cpythonpython_implcpython.yaml} | 2 +- ...on3.11.____cpythonpython_implcpython.yaml} | 2 +- ...on3.12.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 2 +- ...arm64_numpy2.0python3.10.____cpython.yaml} | 2 +- ...arm64_numpy2.0python3.11.____cpython.yaml} | 2 +- ...arm64_numpy2.0python3.12.____cpython.yaml} | 2 +- ..._arm64_numpy2.0python3.9.____cpython.yaml} | 2 +- ...on3.10.____cpythonpython_implcpython.yaml} | 2 +- ...on3.11.____cpythonpython_implcpython.yaml} | 2 +- ...on3.12.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.9.____cpythonpython_implcpython.yaml} | 2 +- README.md | 74 +++++++++---------- 20 files changed, 89 insertions(+), 89 deletions(-) rename .ci_support/{linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml => linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml => linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml => linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml => linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml => osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml => osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml => osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml => osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.22python3.10.____cpython.yaml => osx_arm64_numpy2.0python3.10.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_numpy2.0python3.11.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.26python3.12.____cpython.yaml => osx_arm64_numpy2.0python3.12.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.22python3.9.____cpython.yaml => osx_arm64_numpy2.0python3.9.____cpython.yaml} (98%) rename .ci_support/{win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml => win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml} (97%) rename .ci_support/{win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml => win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml} (97%) rename .ci_support/{win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml => win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml} (97%) rename .ci_support/{win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml => win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml} (97%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 0c84cb1..cb2d841 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,24 +8,24 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.22python3.10.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.22python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.22python3.8.____cpythonpython_implcpython: CONFIG: linux_64_numpy1.22python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.9.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.22python3.9.____cpythonpython_implcpython + linux_64_numpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: linux_64_numpy2.0python3.10.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: linux_64_numpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.23python3.11.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.23python3.11.____cpythonpython_implcpython + linux_64_numpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: linux_64_numpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.26python3.12.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.26python3.12.____cpythonpython_implcpython + linux_64_numpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: linux_64_numpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a37d70c..738d898 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,35 +8,35 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.10.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.22python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.8.____cpythonpython_implcpython: CONFIG: osx_64_numpy1.22python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.22python3.9.____cpythonpython_implcpython + osx_64_numpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: osx_64_numpy2.0python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.23python3.11.____cpythonpython_implcpython + osx_64_numpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: osx_64_numpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.26python3.12.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.26python3.12.____cpythonpython_implcpython + osx_64_numpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: osx_64_numpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_64_numpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: osx_64_numpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.8.____cpython: CONFIG: osx_arm64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.9.____cpython: - CONFIG: osx_arm64_numpy1.22python3.9.____cpython + osx_arm64_numpy2.0python3.10.____cpython: + CONFIG: osx_arm64_numpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy2.0python3.11.____cpython: + CONFIG: osx_arm64_numpy2.0python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_numpy2.0python3.12.____cpython: + CONFIG: osx_arm64_numpy2.0python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.26python3.12.____cpython: - CONFIG: osx_arm64_numpy1.26python3.12.____cpython + osx_arm64_numpy2.0python3.9.____cpython: + CONFIG: osx_arm64_numpy2.0python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 4fac2f4..18f5e9c 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,20 +8,20 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.22python3.10.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.22python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.22python3.8.____cpythonpython_implcpython: CONFIG: win_64_numpy1.22python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.22python3.9.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.22python3.9.____cpythonpython_implcpython + win_64_numpy2.0python3.10.____cpythonpython_implcpython: + CONFIG: win_64_numpy2.0python3.10.____cpythonpython_implcpython + UPLOAD_PACKAGES: 'True' + win_64_numpy2.0python3.11.____cpythonpython_implcpython: + CONFIG: win_64_numpy2.0python3.11.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.23python3.11.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.23python3.11.____cpythonpython_implcpython + win_64_numpy2.0python3.12.____cpythonpython_implcpython: + CONFIG: win_64_numpy2.0python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.26python3.12.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.26python3.12.____cpythonpython_implcpython + win_64_numpy2.0python3.9.____cpythonpython_implcpython: + CONFIG: win_64_numpy2.0python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml index bf9f98b..1c76223 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml index 9ec4917..3bb0889 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml index 98372f3..b7653e0 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml index 6cde224..6bb7a20 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml index 6a11512..e7620b2 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml index 847091c..43562b4 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml index 933f235..ec74ada 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml index 14852a5..f62df6a 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 638d612..5b9bb22 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index fda0cf5..c2b4208 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index d029bbb..6da47a0 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index fa9ca36..7bd92f5 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -23,7 +23,7 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml index be8a254..24730fa 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml index 6c7bfa3..ab2aaa4 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.23' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml index 8783993..6be04e8 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.26' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml index ae9aae7..d34d923 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy2.0python3.9.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - vs2019 numpy: -- '1.22' +- '2.0' pin_run_as_build: python: min_pin: x.x diff --git a/README.md b/README.md index 2d7a9de..2fe2a25 100644 --- a/README.md +++ b/README.md @@ -42,13 +42,6 @@ Current build status - - - - + - + - + - + @@ -91,31 +84,31 @@ Current build status - + - + - + - + @@ -126,31 +119,31 @@ Current build status - + - + - + - + @@ -161,24 +154,31 @@ Current build status - + + + + - + - + From 97986ebfd28828dae51bdd1af21782ead26a5f11 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 15 Jul 2024 06:34:11 +0200 Subject: [PATCH 3/4] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ca8737f..24e3d31 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,7 @@ source: build: number: 1 skip: true # [python_impl == 'pypy'] + skip: ture # [win and numpy >= 2.0] script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv # [not win] script: set PHONOPY_USE_OMP=OFF && {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv # [win] From 38365639884b9c4759b2d7672400202ab1a6c06e Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 15 Jul 2024 06:55:13 +0200 Subject: [PATCH 4/4] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 24e3d31..e106136 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: build: number: 1 skip: true # [python_impl == 'pypy'] - skip: ture # [win and numpy >= 2.0] + skip: ture # [win and numpy == '2.0'] script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv # [not win] script: set PHONOPY_USE_OMP=OFF && {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv # [win]
VariantStatus
linux_64_numpy1.22python3.10.____cpythonpython_implcpython - - variant - -
linux_64_numpy1.22python3.8.____cpythonpython_implcpython @@ -56,31 +49,31 @@ Current build status
linux_64_numpy1.22python3.9.____cpythonpython_implcpythonlinux_64_numpy2.0python3.10.____cpythonpython_implcpython - variant + variant
linux_64_numpy1.23python3.11.____cpythonpython_implcpythonlinux_64_numpy2.0python3.11.____cpythonpython_implcpython - variant + variant
linux_64_numpy1.26python3.12.____cpythonpython_implcpythonlinux_64_numpy2.0python3.12.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.22python3.10.____cpythonpython_implcpythonlinux_64_numpy2.0python3.9.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.22python3.9.____cpythonpython_implcpythonosx_64_numpy2.0python3.10.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonpython_implcpythonosx_64_numpy2.0python3.11.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.26python3.12.____cpythonpython_implcpythonosx_64_numpy2.0python3.12.____cpythonpython_implcpython - variant + variant
osx_arm64_numpy1.22python3.10.____cpythonosx_64_numpy2.0python3.9.____cpythonpython_implcpython - variant + variant
osx_arm64_numpy1.22python3.9.____cpythonosx_arm64_numpy2.0python3.10.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonosx_arm64_numpy2.0python3.11.____cpython - variant + variant
osx_arm64_numpy1.26python3.12.____cpythonosx_arm64_numpy2.0python3.12.____cpython - variant + variant
win_64_numpy1.22python3.10.____cpythonpython_implcpythonosx_arm64_numpy2.0python3.9.____cpython - variant + variant
win_64_numpy1.22python3.9.____cpythonpython_implcpythonwin_64_numpy2.0python3.10.____cpythonpython_implcpython + + variant + +
win_64_numpy2.0python3.11.____cpythonpython_implcpython - variant + variant
win_64_numpy1.23python3.11.____cpythonpython_implcpythonwin_64_numpy2.0python3.12.____cpythonpython_implcpython - variant + variant
win_64_numpy1.26python3.12.____cpythonpython_implcpythonwin_64_numpy2.0python3.9.____cpythonpython_implcpython - variant + variant