Skip to content

Commit

Permalink
Relax minimum numpy version to 1.26.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mplough-kobold committed Sep 12, 2024
1 parent d44352e commit 161957e
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/scripts/test-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ PYVER=${PYTHON_VERSION//.}

# Install package and test
${PYBIN}/pip install ./dist/rawpy*cp${PYVER}*manylinux*${PYTHON_ARCH}*.whl

${PYBIN}/pip install -r dev-requirements.txt
${PYBIN}/pip install -r dev-requirements.txt "numpy==${NUMPY_VERSION}"

mkdir tmp_for_test
pushd tmp_for_test
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/test-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ source env/$VENV/bin/activate
pip install dist/rawpy*cp${PYVER}*macosx*${PYTHON_ARCH}*.whl

# Test installed rawpy
pip install -r dev-requirements.txt
pip install -r dev-requirements.txt "numpy==${NUMPY_VERSION}"
mkdir tmp_for_test
pushd tmp_for_test
python -u -m pytest -v -s ../test
Expand Down
5 changes: 4 additions & 1 deletion .github/scripts/test-windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ if (!$env:PYTHON_VERSION) {
if ($env:PYTHON_ARCH -ne 'x86' -and $env:PYTHON_ARCH -ne 'x86_64') {
throw "PYTHON_ARCH env var must be x86 or x86_64"
}
if (!$env:NUMPY_VERSION) {
throw "NUMPY_VERSION env var missing"
}

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

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

# Avoid using in-source package during tests
mkdir -f tmp_for_test | out-null
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,12 @@ jobs:
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '2.0.*'
- os-image: ubuntu-latest
os-name: linux
docker-image: quay.io/pypa/manylinux2014_x86_64
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '1.26.4'

- os-image: ubuntu-latest
os-name: linux
Expand All @@ -263,6 +269,12 @@ jobs:
python-arch: 'aarch64'
python-version: '3.12'
numpy-version: '2.0.*'
- os-image: ubuntu-latest
os-name: linux
docker-image: quay.io/pypa/manylinux2014_aarch64
python-arch: 'aarch64'
python-version: '3.12'
numpy-version: '1.26.4'

- os-image: macos-12
os-name: mac
Expand All @@ -288,6 +300,12 @@ jobs:
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '2.0.*'
- os-image: macos-12
os-name: mac
macos-min-version: '10.9'
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '1.26.4'

- os-image: macos-14 # M1
os-name: mac
Expand All @@ -313,6 +331,12 @@ jobs:
python-arch: 'arm64'
python-version: '3.12'
numpy-version: '2.0.*'
- os-image: macos-14 # M1
os-name: mac
macos-min-version: '11.0'
python-arch: 'arm64'
python-version: '3.12'
numpy-version: '1.26.4'

- os-image: windows-2019
os-name: windows
Expand All @@ -334,6 +358,11 @@ jobs:
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '2.0.*'
- os-image: windows-2019
os-name: windows
python-arch: 'x86_64'
python-version: '3.12'
numpy-version: '1.26.4'

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

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,5 +312,5 @@ def mac_libraw_compile():
packages = find_packages(),
ext_modules = extensions,
package_data = package_data,
install_requires=['numpy >= 2.0']
install_requires=['numpy >= 1.26.0']
)

0 comments on commit 161957e

Please sign in to comment.