From e121f00457164355ebbd7e4c158c2b399ca8ded6 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 19 Jun 2024 10:40:30 +0100 Subject: [PATCH 1/7] Trigger Build From 521f18eef67b62bc10ac42de5266ff0b767b90ce Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 19 Jun 2024 10:20:59 +0100 Subject: [PATCH 2/7] Un-pin max version of numpy --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1b9ccca4..5085a1e1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ A Python package providing buffer compression and transformation codecs \ for use in data storage and communication applications.""" readme = "README.rst" dependencies = [ - "numpy>=1.7,<2", + "numpy>=1.7", ] requires-python = ">=3.10" dynamic = [ From bfb9063d5bbad7245b86c1d737d737074cb42d33 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 19 Jun 2024 14:04:58 +0100 Subject: [PATCH 3/7] Don't install zfpy in tests --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3172bb95..d4d879c7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -59,7 +59,8 @@ jobs: run: | conda activate env export DISABLE_NUMCODECS_AVX2="" - python -m pip install -v -e .[test,test_extras,msgpack,zfpy,pcodec] + # TODO: put back zfpy import when it supports numpy 2.0 + python -m pip install -v -e .[test,test_extras,msgpack,pcodec] - name: List installed packages shell: "bash -l {0}" From 56d03ad545c81b6892604805a484f97d4da73f94 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2024 10:32:46 +0100 Subject: [PATCH 4/7] Test with zfpy on Python 3.10 --- .github/workflows/ci.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d4d879c7..95c47364 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -62,6 +62,14 @@ jobs: # TODO: put back zfpy import when it supports numpy 2.0 python -m pip install -v -e .[test,test_extras,msgpack,pcodec] + # This is used to test with zfpy, which does not yet support numpy 2.0 + - name: Install older numpy and zfpy + if: ${{ matrix.python-version }} == '3.10' + shell: "bash -l {0}" + run: | + conda activate env + python -m pip install zfpy>1 numpy<2 + - name: List installed packages shell: "bash -l {0}" run: | From a141f4d14ab29dd5ce669ed222a29b9bfbdcf981 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2024 10:37:05 +0100 Subject: [PATCH 5/7] Fix conditionals --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 95c47364..2ec0e174 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,7 +44,7 @@ jobs: - name: Install clang shell: "bash -l {0}" - if: ${{ matrix.platform }} == 'macos-12' + if: matrix.platform == 'macos-12' run: | conda activate env conda install -y 'clang>=12.0.1,<17' @@ -64,7 +64,7 @@ jobs: # This is used to test with zfpy, which does not yet support numpy 2.0 - name: Install older numpy and zfpy - if: ${{ matrix.python-version }} == '3.10' + if: matrix.python-version == '3.10' shell: "bash -l {0}" run: | conda activate env From 0517be35377f9e3daf999e7523b4adc401cf2764 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2024 10:40:24 +0100 Subject: [PATCH 6/7] Quote constraints --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2ec0e174..e10dd608 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,7 +68,7 @@ jobs: shell: "bash -l {0}" run: | conda activate env - python -m pip install zfpy>1 numpy<2 + python -m pip install "zfpy>1" "numpy<2" - name: List installed packages shell: "bash -l {0}" From 645fecbe1e1514c8b5b9304a226ad0487ad61138 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 20 Jun 2024 10:44:51 +0100 Subject: [PATCH 7/7] fix zfpy pin --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e10dd608..effcf998 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,7 +68,7 @@ jobs: shell: "bash -l {0}" run: | conda activate env - python -m pip install "zfpy>1" "numpy<2" + python -m pip install "zfpy>=1" "numpy<2" - name: List installed packages shell: "bash -l {0}"