From 661a0a638239997b3c2635754054c2c88581858a Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Mon, 30 Oct 2023 12:24:35 -0400 Subject: [PATCH 01/15] Testing dev tests with numpy 2.0 --- pyproject.toml | 1 + requirements-dev-numpy.txt | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 requirements-dev-numpy.txt diff --git a/pyproject.toml b/pyproject.toml index 9742f8586..fbb30a94c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,6 +2,7 @@ name = "crds" description = "Calibration Reference Data System, HST/JWST/Roman reference file management" authors = [{ name = "STScI CRDS s/w developers" }] +requires-python = ">=3.11" classifiers = [ "Intended Audience :: Science/Research", "License :: OSI Approved :: BSD License", diff --git a/requirements-dev-numpy.txt b/requirements-dev-numpy.txt new file mode 100644 index 000000000..de868ac7f --- /dev/null +++ b/requirements-dev-numpy.txt @@ -0,0 +1,3 @@ +# Use Bi-weekly numpy dev build +--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple +numpy>=2.0.0.dev0 From 69b0a0115a925c43e3842ced3a8241463695f2ae Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Mon, 30 Oct 2023 16:09:29 -0400 Subject: [PATCH 02/15] Testing dev tests with numpy 2.0 --- pyproject.toml | 2 +- requirements-dev-numpy.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fbb30a94c..9fed1829a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "crds" description = "Calibration Reference Data System, HST/JWST/Roman reference file management" authors = [{ name = "STScI CRDS s/w developers" }] -requires-python = ">=3.11" +#requires-python = ">=3.11" classifiers = [ "Intended Audience :: Science/Research", "License :: OSI Approved :: BSD License", diff --git a/requirements-dev-numpy.txt b/requirements-dev-numpy.txt index de868ac7f..b1682095f 100644 --- a/requirements-dev-numpy.txt +++ b/requirements-dev-numpy.txt @@ -1,3 +1,3 @@ # Use Bi-weekly numpy dev build ---extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple -numpy>=2.0.0.dev0 +#--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple +#numpy>=2.0.0.dev0 From d966728b7e92e5ecbb41793c7867b5df51f2cefd Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Mon, 30 Oct 2023 17:28:46 -0400 Subject: [PATCH 03/15] Testing dev tests with numpy 2.0 --- pyproject.toml | 2 +- requirements-dev-numpy.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9fed1829a..fbb30a94c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "crds" description = "Calibration Reference Data System, HST/JWST/Roman reference file management" authors = [{ name = "STScI CRDS s/w developers" }] -#requires-python = ">=3.11" +requires-python = ">=3.11" classifiers = [ "Intended Audience :: Science/Research", "License :: OSI Approved :: BSD License", diff --git a/requirements-dev-numpy.txt b/requirements-dev-numpy.txt index b1682095f..de868ac7f 100644 --- a/requirements-dev-numpy.txt +++ b/requirements-dev-numpy.txt @@ -1,3 +1,3 @@ # Use Bi-weekly numpy dev build -#--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple -#numpy>=2.0.0.dev0 +--extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple +numpy>=2.0.0.dev0 From f6491437509db36ed1d575004089278d32de8d54 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 11:04:21 -0400 Subject: [PATCH 04/15] Testing dev tests with numpy 2.0 --- requirements-dev-numpy.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev-numpy.txt b/requirements-dev-numpy.txt index de868ac7f..c8f4996c0 100644 --- a/requirements-dev-numpy.txt +++ b/requirements-dev-numpy.txt @@ -1,3 +1,4 @@ # Use Bi-weekly numpy dev build --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy>=2.0.0.dev0 +scipy>=0.0.dev0 From 9b1f1841f09492c10c3df34730cc7c7a6eb1dd06 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 16:40:26 -0400 Subject: [PATCH 05/15] Testing dev tests with numpy 2.0 --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fbb30a94c..c8a328c40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ name = "crds" description = "Calibration Reference Data System, HST/JWST/Roman reference file management" authors = [{ name = "STScI CRDS s/w developers" }] -requires-python = ">=3.11" +requires-python = ">=3.9" classifiers = [ "Intended Audience :: Science/Research", "License :: OSI Approved :: BSD License", @@ -18,6 +18,8 @@ dependencies = [ "asdf != 3.0.0", "requests", "parsley", + {file = ["requirements-dev-numpy.txt"]}, + ] dynamic = ["version"] From fd7cf3fe32d228ddbf623d829909b2c62172ca21 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 16:45:22 -0400 Subject: [PATCH 06/15] Testing dev tests with numpy 2.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c8a328c40..fa89d344c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ dependencies = [ "asdf != 3.0.0", "requests", "parsley", - {file = ["requirements-dev-numpy.txt"]}, + "requirements-dev-numpy.txt", ] dynamic = ["version"] From dbce6fd2b3e04e5d5a0629973b5ac3ca27d5d6bc Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 17:09:32 -0400 Subject: [PATCH 07/15] Continuing to try to test numpy 2.0 --- crds_setup_crds | 2 +- pyproject.toml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/crds_setup_crds b/crds_setup_crds index 581133484..aacd48f40 100755 --- a/crds_setup_crds +++ b/crds_setup_crds @@ -1,6 +1,6 @@ #! /bin/bash -pip install --upgrade numpy +pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy pip install --upgrade git+https://github.com/spacetelescope/jwst pip uninstall --yes crds diff --git a/pyproject.toml b/pyproject.toml index fa89d344c..d9bdcfb4a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,8 +18,6 @@ dependencies = [ "asdf != 3.0.0", "requests", "parsley", - "requirements-dev-numpy.txt", - ] dynamic = ["version"] From 7d87e0e001305bef822161a19e63c3a0d70b8fc5 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 17:21:55 -0400 Subject: [PATCH 08/15] Continuing to try to test numpy 2.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d9bdcfb4a..ced54ada5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ classifiers = [ ] dependencies = [ "astropy", - "numpy", + "numpy>=2.0", "filelock", "asdf != 3.0.0", "requests", From 133e2ada84087b38890ee6b2b2b2b75774d848c3 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 17:26:10 -0400 Subject: [PATCH 09/15] Continuing to try to test numpy 2.0 --- .github/workflows/ci.yml | 1 + pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7cf6c0315..0ae54d82e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,7 @@ jobs: init-shell: bash cache-environment: true cache-downloads: true + - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - run: pip install roman-datamodels git+https://github.com/spacetelescope/jwst - run: pip uninstall --yes crds && ./install && pip install .[submission,test,docs,synphot] - id: cache diff --git a/pyproject.toml b/pyproject.toml index ced54ada5..d9bdcfb4a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ classifiers = [ ] dependencies = [ "astropy", - "numpy>=2.0", + "numpy", "filelock", "asdf != 3.0.0", "requests", From a994ab8b018d31523464a9dea254889a738bc9f4 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 17:28:03 -0400 Subject: [PATCH 10/15] Continuing to try to test numpy 2.0 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ae54d82e..de29bdc89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,7 @@ jobs: init-shell: bash cache-environment: true cache-downloads: true + - run: pip uninstall numpy - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - run: pip install roman-datamodels git+https://github.com/spacetelescope/jwst - run: pip uninstall --yes crds && ./install && pip install .[submission,test,docs,synphot] From 0b09c102c2a8e7a89f41fc532814fb4a766972b8 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 17:30:09 -0400 Subject: [PATCH 11/15] Continuing to try to test numpy 2.0 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de29bdc89..bce50af0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: init-shell: bash cache-environment: true cache-downloads: true - - run: pip uninstall numpy + - run: pip uninstall -y numpy - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - run: pip install roman-datamodels git+https://github.com/spacetelescope/jwst - run: pip uninstall --yes crds && ./install && pip install .[submission,test,docs,synphot] From 1a466af04feefe85dc7efeee49123565ca27c1fa Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Tue, 31 Oct 2023 18:02:16 -0400 Subject: [PATCH 12/15] Continuing to try to test numpy 2.0 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bce50af0b..bd6b0d1b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,8 +68,6 @@ jobs: init-shell: bash cache-environment: true cache-downloads: true - - run: pip uninstall -y numpy - - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - run: pip install roman-datamodels git+https://github.com/spacetelescope/jwst - run: pip uninstall --yes crds && ./install && pip install .[submission,test,docs,synphot] - id: cache @@ -79,4 +77,6 @@ jobs: ${{ needs.cache.outputs.path }} ${{ needs.cache.outputs.testing_cache }} key: ${{ needs.cache.outputs.key }} + - run: pip uninstall -y numpy + - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - run: ./runtests --cover From 1013dfa6d927ade020cadc256c50d5f6f9af5ce7 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Wed, 1 Nov 2023 13:55:28 -0400 Subject: [PATCH 13/15] Continuing to try to test numpy 2.0 --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd6b0d1b7..a58599a3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,5 +78,7 @@ jobs: ${{ needs.cache.outputs.testing_cache }} key: ${{ needs.cache.outputs.key }} - run: pip uninstall -y numpy + - run: pip uninstall -y astropy - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy + - run: pip install git+https://github.com/astropy/astropy.git - run: ./runtests --cover From b3061c63045890727a97435e64cda06b89839ac7 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 2 Nov 2023 10:33:50 -0400 Subject: [PATCH 14/15] Continuing to try to test numpy 2.0 --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a58599a3b..131783a8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,8 +77,10 @@ jobs: ${{ needs.cache.outputs.path }} ${{ needs.cache.outputs.testing_cache }} key: ${{ needs.cache.outputs.key }} - - run: pip uninstall -y numpy - - run: pip uninstall -y astropy + - run: pip uninstall -y numpy astropy scipy matplotlib contourpy - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy + - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy - run: pip install git+https://github.com/astropy/astropy.git + - run: pip install git+https://github.com/matplotlib/matplotlib.git + - run: pip install git+https://github.com/contourpy/contourpy.git - run: ./runtests --cover From 4687d2c799dc6b926eb649137eb46494164388e6 Mon Sep 17 00:00:00 2001 From: Hunter Brown Date: Thu, 2 Nov 2023 11:27:58 -0400 Subject: [PATCH 15/15] Continuing to try to test numpy 2.0 --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 131783a8c..ff9ce79a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,10 +77,11 @@ jobs: ${{ needs.cache.outputs.path }} ${{ needs.cache.outputs.testing_cache }} key: ${{ needs.cache.outputs.key }} - - run: pip uninstall -y numpy astropy scipy matplotlib contourpy - - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy - - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy + - run: pip uninstall -y astropy matplotlib contourpy - run: pip install git+https://github.com/astropy/astropy.git - run: pip install git+https://github.com/matplotlib/matplotlib.git - run: pip install git+https://github.com/contourpy/contourpy.git + - run: pip uninstall -y numpy scipy + - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy + - run: pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy - run: ./runtests --cover