From 9ad424287569d53597601beaddfe4d201664c95e Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Thu, 30 Jun 2022 12:48:37 +0200 Subject: [PATCH 1/2] Work around numpy/numpy#21889 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 206a1e60..e55372af 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,5 +4,5 @@ requires = [ "wheel", "scikit-build>=0.14.1", "cmake", - "numpy"] + "numpy!=1.23.0"] build-backend = "setuptools.build_meta" From d5769a413c30860dd2bfbaf2349eb279df28dcea Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Thu, 30 Jun 2022 14:18:03 +0200 Subject: [PATCH 2/2] conflict numpy-1.23 in conda --- .github/conda-env/build-env.yml | 2 +- .github/workflows/slycot-build-and-test.yml | 1 - conda-recipe/meta.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/conda-env/build-env.yml b/.github/conda-env/build-env.yml index f747a77e..64ef8932 100644 --- a/.github/conda-env/build-env.yml +++ b/.github/conda-env/build-env.yml @@ -1,4 +1,4 @@ name: build-env dependencies: - boa - - numpy + - numpy!=1.23.0 diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 54367ed2..b8f84ade 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -167,7 +167,6 @@ jobs: shell: bash -l {0} run: | set -e - mamba install boa numpy numpyversion=$(python -c 'import numpy; print(numpy.version.version)') conda mambabuild --python "${{ matrix.python }}" --numpy $numpyversion conda-recipe # preserve directory structure for custom conda channel diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 55314c06..b3e846db 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: - libcblas * *netlib - liblapack * *netlib - python - - numpy + - numpy!=1.23.0 - pip - scikit-build >=0.14.1