From 9ea2b892e151220c3fcec6b1bb233dec5233f6c8 Mon Sep 17 00:00:00 2001 From: Nathan Goldbaum Date: Thu, 25 May 2023 10:56:25 -0600 Subject: [PATCH] update dtype API and get nightly wheels from new location --- .github/workflows/ci.yml | 2 +- asciidtype/asciidtype/src/asciidtype_main.c | 2 +- asv_benchmarks/asv.conf.json | 2 +- metadatadtype/metadatadtype/src/metadatadtype_main.c | 2 +- mpfdtype/mpfdtype/src/mpfdtype_main.c | 2 +- quaddtype/README.md | 2 +- quaddtype/quaddtype/src/quaddtype_main.c | 2 +- stringdtype/README.md | 2 +- stringdtype/stringdtype/src/main.c | 2 +- unytdtype/unytdtype/src/unytdtype_main.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfb0249b..b422c686 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: python-version: "3.10" - name: Install build and test dependencies run: | - pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy + pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy python -m pip install -U pip build pytest unyt wheel meson ninja meson-python patchelf - name: Install asciidtype working-directory: asciidtype diff --git a/asciidtype/asciidtype/src/asciidtype_main.c b/asciidtype/asciidtype/src/asciidtype_main.c index b341e859..858df1cb 100644 --- a/asciidtype/asciidtype/src/asciidtype_main.c +++ b/asciidtype/asciidtype/src/asciidtype_main.c @@ -22,7 +22,7 @@ PyInit__asciidtype_main(void) return NULL; } - if (import_experimental_dtype_api(10) < 0) { + if (import_experimental_dtype_api(11) < 0) { return NULL; } diff --git a/asv_benchmarks/asv.conf.json b/asv_benchmarks/asv.conf.json index 0258a967..a60ecd07 100644 --- a/asv_benchmarks/asv.conf.json +++ b/asv_benchmarks/asv.conf.json @@ -22,7 +22,7 @@ // uninstalling the project. See asv.conf.json documentation. // "install_command": [ - "pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy", + "pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy", "pip install meson-python patchelf wheel", "in-dir={conf_dir} pip install ../asciidtype/ --no-build-isolation", "in-dir={conf_dir} pip install ../stringdtype/ --no-build-isolation" diff --git a/metadatadtype/metadatadtype/src/metadatadtype_main.c b/metadatadtype/metadatadtype/src/metadatadtype_main.c index e432accb..e7783fde 100644 --- a/metadatadtype/metadatadtype/src/metadatadtype_main.c +++ b/metadatadtype/metadatadtype/src/metadatadtype_main.c @@ -21,7 +21,7 @@ PyInit__metadatadtype_main(void) if (_import_array() < 0) { return NULL; } - if (import_experimental_dtype_api(10) < 0) { + if (import_experimental_dtype_api(11) < 0) { return NULL; } diff --git a/mpfdtype/mpfdtype/src/mpfdtype_main.c b/mpfdtype/mpfdtype/src/mpfdtype_main.c index 94ae37d7..a6a0c626 100644 --- a/mpfdtype/mpfdtype/src/mpfdtype_main.c +++ b/mpfdtype/mpfdtype/src/mpfdtype_main.c @@ -22,7 +22,7 @@ PyInit__mpfdtype_main(void) if (_import_array() < 0) { return NULL; } - if (import_experimental_dtype_api(10) < 0) { + if (import_experimental_dtype_api(11) < 0) { return NULL; } diff --git a/quaddtype/README.md b/quaddtype/README.md index 875abe7f..f1b9322e 100644 --- a/quaddtype/README.md +++ b/quaddtype/README.md @@ -9,7 +9,7 @@ isolation so that the `quaddtype` can link against the experimental dtype API headers, which aren't in the latest releases of `numpy`: ```bash -pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy +pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy pip install . --no-build-isolation ``` diff --git a/quaddtype/quaddtype/src/quaddtype_main.c b/quaddtype/quaddtype/src/quaddtype_main.c index e7420946..41060d33 100644 --- a/quaddtype/quaddtype/src/quaddtype_main.c +++ b/quaddtype/quaddtype/src/quaddtype_main.c @@ -23,7 +23,7 @@ PyInit__quaddtype_main(void) return NULL; // Fail to init if the experimental DType API version 5 isn't supported - if (import_experimental_dtype_api(10) < 0) { + if (import_experimental_dtype_api(11) < 0) { PyErr_SetString(PyExc_ImportError, "Error encountered importing the experimental dtype API."); return NULL; diff --git a/stringdtype/README.md b/stringdtype/README.md index fe8550bf..0799deb0 100644 --- a/stringdtype/README.md +++ b/stringdtype/README.md @@ -17,7 +17,7 @@ It is important to have the latest development version of numpy installed. Nightly wheels work well for this purpose, and can be installed easily: ```bash -$ pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy +$ pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy ``` Build with meson, create a wheel, and install it. diff --git a/stringdtype/stringdtype/src/main.c b/stringdtype/stringdtype/src/main.c index 41b1eb76..da2c7ebc 100644 --- a/stringdtype/stringdtype/src/main.c +++ b/stringdtype/stringdtype/src/main.c @@ -91,7 +91,7 @@ PyInit__main(void) if (_import_array() < 0) { return NULL; } - if (import_experimental_dtype_api(10) < 0) { + if (import_experimental_dtype_api(11) < 0) { return NULL; } diff --git a/unytdtype/unytdtype/src/unytdtype_main.c b/unytdtype/unytdtype/src/unytdtype_main.c index 541d1e2c..ed4d2d12 100644 --- a/unytdtype/unytdtype/src/unytdtype_main.c +++ b/unytdtype/unytdtype/src/unytdtype_main.c @@ -21,7 +21,7 @@ PyInit__unytdtype_main(void) if (_import_array() < 0) { return NULL; } - if (import_experimental_dtype_api(10) < 0) { + if (import_experimental_dtype_api(11) < 0) { return NULL; }