Test NumPy 1 separately

tomwhite · tomwhite · commit 61ad766dd915 · 2025-03-31T17:41:54.000+01:00
diff --git a/.github/workflows/build-numpy-1.yml b/.github/workflows/build-numpy-1.yml
@@ -1,4 +1,4 @@
-name: Build NumPy 2
+name: Build NumPy 1
 
 on:
   push:
@@ -22,7 +22,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-numpy2.txt -r requirements-numpy2-dev.txt
+        pip install -r requirements-numpy1.txt -r requirements-numpy1-dev.txt
     # - name: Run pre-commit
     #   uses: pre-commit/action@v2.0.0
     - name: Test with pytest and coverage
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -12,7 +12,7 @@ scikit-learn
 partd
 bed-reader
 rechunker
-cbgen < 1.0.5
+cbgen > 1.0.5
 bio2zarr @ git+https://github.com/sgkit-dev/bio2zarr.git; platform_system != "Windows"
 yarl
 matplotlib
diff --git a/requirements-numpy1-dev.txt b/requirements-numpy1-dev.txt
@@ -12,7 +12,7 @@ scikit-learn
 partd
 bed-reader
 rechunker
-cbgen > 1.0.5
+cbgen < 1.0.5
 bio2zarr @ git+https://github.com/sgkit-dev/bio2zarr.git; platform_system != "Windows"
 yarl
 matplotlib
diff --git a/requirements-numpy1.txt b/requirements-numpy1.txt
@@ -1,4 +1,4 @@
-numpy < 2.2
+numpy < 2
 xarray < 2025.03.1
 dask[array,dataframe] >= 2023.01.0, <= 2024.8.0
 distributed >= 2023.01.0, <= 2024.8.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-numpy < 2
+numpy < 2.2
 xarray < 2025.03.1
 dask[array,dataframe] >= 2023.01.0, <= 2024.8.0
 distributed >= 2023.01.0, <= 2024.8.0
diff --git a/setup.cfg b/setup.cfg
@@ -27,7 +27,7 @@ zip_safe = False  # https://mypy.readthedocs.io/en/latest/installed_packages.htm
 include_package_data = True
 python_requires = >=3.10
 install_requires =
-    numpy < 2
+    numpy < 2.2
     xarray < 2025.03.1
     dask[array,dataframe] >= 2022.01.0, <= 2024.8.0
     distributed >= 2022.01.0, <= 2024.8.0
@@ -60,7 +60,7 @@ plink =
     bed-reader
 bgen =
     rechunker
-    cbgen < 1.0.5
+    cbgen > 1.0.5
 
 [coverage:report]
 fail_under = 100

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-numpy < 2.2`
	`1`	`+numpy < 2`
`2`	`2`	`xarray < 2025.03.1`
`3`	`3`	`dask[array,dataframe] >= 2023.01.0, <= 2024.8.0`
`4`	`4`	`distributed >= 2023.01.0, <= 2024.8.0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-numpy < 2`
	`1`	`+numpy < 2.2`
`2`	`2`	`xarray < 2025.03.1`
`3`	`3`	`dask[array,dataframe] >= 2023.01.0, <= 2024.8.0`
`4`	`4`	`distributed >= 2023.01.0, <= 2024.8.0`