Skip to content

Commit 55d97bc

Browse files
Relax minimum numpy version to 1.26.0 (#243)
1 parent a0b9089 commit 55d97bc

File tree

5 files changed

+39
-5
lines changed

5 files changed

+39
-5
lines changed

.github/scripts/test-linux.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ PYVER=${PYTHON_VERSION//.}
2222

2323
# Install package and test
2424
${PYBIN}/pip install ./dist/rawpy*cp${PYVER}*manylinux*${PYTHON_ARCH}*.whl
25-
26-
${PYBIN}/pip install -r dev-requirements.txt
25+
${PYBIN}/pip install -r dev-requirements.txt "numpy==${NUMPY_VERSION}"
2726

2827
mkdir tmp_for_test
2928
pushd tmp_for_test

.github/scripts/test-macos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ source env/$VENV/bin/activate
1111
pip install dist/rawpy*cp${PYVER}*macosx*${PYTHON_ARCH}*.whl
1212

1313
# Test installed rawpy
14-
pip install -r dev-requirements.txt
14+
pip install -r dev-requirements.txt "numpy==${NUMPY_VERSION}"
1515
mkdir tmp_for_test
1616
pushd tmp_for_test
1717
python -u -m pytest -v -s ../test

.github/scripts/test-windows.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ if (!$env:PYTHON_VERSION) {
6565
if ($env:PYTHON_ARCH -ne 'x86' -and $env:PYTHON_ARCH -ne 'x86_64') {
6666
throw "PYTHON_ARCH env var must be x86 or x86_64"
6767
}
68+
if (!$env:NUMPY_VERSION) {
69+
throw "NUMPY_VERSION env var missing"
70+
}
6871

6972
$PYVER = ($env:PYTHON_VERSION).Replace('.', '')
7073

@@ -90,7 +93,7 @@ Exit-VEnv
9093
Create-And-Enter-VEnv testsuite
9194
python -m pip uninstall -y rawpy
9295
ls dist\*cp${PYVER}*win*.whl | % { exec { python -m pip install $_ } }
93-
exec { python -m pip install -r dev-requirements.txt }
96+
exec { python -m pip install -r dev-requirements.txt numpy==$env:NUMPY_VERSION }
9497

9598
# Avoid using in-source package during tests
9699
mkdir -f tmp_for_test | out-null

.github/workflows/ci.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,12 @@ jobs:
238238
python-arch: 'x86_64'
239239
python-version: '3.12'
240240
numpy-version: '2.0.*'
241+
- os-image: ubuntu-latest
242+
os-name: linux
243+
docker-image: quay.io/pypa/manylinux2014_x86_64
244+
python-arch: 'x86_64'
245+
python-version: '3.12'
246+
numpy-version: '1.26.4'
241247

242248
- os-image: ubuntu-latest
243249
os-name: linux
@@ -263,6 +269,12 @@ jobs:
263269
python-arch: 'aarch64'
264270
python-version: '3.12'
265271
numpy-version: '2.0.*'
272+
- os-image: ubuntu-latest
273+
os-name: linux
274+
docker-image: quay.io/pypa/manylinux2014_aarch64
275+
python-arch: 'aarch64'
276+
python-version: '3.12'
277+
numpy-version: '1.26.4'
266278

267279
- os-image: macos-12
268280
os-name: mac
@@ -288,6 +300,12 @@ jobs:
288300
python-arch: 'x86_64'
289301
python-version: '3.12'
290302
numpy-version: '2.0.*'
303+
- os-image: macos-12
304+
os-name: mac
305+
macos-min-version: '10.9'
306+
python-arch: 'x86_64'
307+
python-version: '3.12'
308+
numpy-version: '1.26.4'
291309

292310
- os-image: macos-14 # M1
293311
os-name: mac
@@ -313,6 +331,12 @@ jobs:
313331
python-arch: 'arm64'
314332
python-version: '3.12'
315333
numpy-version: '2.0.*'
334+
- os-image: macos-14 # M1
335+
os-name: mac
336+
macos-min-version: '11.0'
337+
python-arch: 'arm64'
338+
python-version: '3.12'
339+
numpy-version: '1.26.4'
316340

317341
- os-image: windows-2019
318342
os-name: windows
@@ -334,6 +358,11 @@ jobs:
334358
python-arch: 'x86_64'
335359
python-version: '3.12'
336360
numpy-version: '2.0.*'
361+
- os-image: windows-2019
362+
os-name: windows
363+
python-arch: 'x86_64'
364+
python-version: '3.12'
365+
numpy-version: '1.26.4'
337366

338367
runs-on: ${{ matrix.config.os-image }}
339368

@@ -361,6 +390,7 @@ jobs:
361390
env:
362391
PYTHON_ARCH: ${{ matrix.config.python-arch }}
363392
PYTHON_VERSION: ${{ matrix.config.python-version }}
393+
NUMPY_VERSION: ${{ matrix.config.numpy-version }}
364394

365395
- name: Setup Python (Windows)
366396
if: matrix.config.os-name == 'windows'
@@ -375,6 +405,7 @@ jobs:
375405
env:
376406
PYTHON_VERSION: ${{ matrix.config.python-version }}
377407
PYTHON_ARCH: ${{ matrix.config.python-arch }}
408+
NUMPY_VERSION: ${{ matrix.config.numpy-version }}
378409

379410
- name: Setup Python (macOS)
380411
if: matrix.config.os-name == 'mac'
@@ -388,6 +419,7 @@ jobs:
388419
env:
389420
PYTHON_ARCH: ${{ matrix.config.python-arch }}
390421
PYTHON_VERSION: ${{ matrix.config.python-version }}
422+
NUMPY_VERSION: ${{ matrix.config.numpy-version }}
391423

392424
docs:
393425
runs-on: ubuntu-latest

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,5 +312,5 @@ def mac_libraw_compile():
312312
packages = find_packages(),
313313
ext_modules = extensions,
314314
package_data = package_data,
315-
install_requires=['numpy >= 2.0']
315+
install_requires=['numpy >= 1.26.0']
316316
)

0 commit comments

Comments
 (0)