From a3c9c79eb5701a33d86b77b156e39ab34f00f4eb Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Sat, 22 Jun 2024 10:25:57 +0200 Subject: [PATCH] Numpy 2 support, drop Python 3.8 (#234) --- .github/workflows/ci.yml | 134 +++++++++++++++------------------------ rawpy/_version.py | 2 +- setup.py | 2 +- 3 files changed, 52 insertions(+), 86 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea4d8ab..60e2af5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,143 +37,126 @@ jobs: matrix: config: # NOTE: When updating this list, also update the 'test' job! - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_x86_64 - python-arch: 'x86_64' - python-version: '3.8' - numpy-version: '1.17.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_x86_64 python-arch: 'x86_64' python-version: '3.9' - numpy-version: '1.19.*' + 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.10' - numpy-version: '1.21.*' + 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.11' - numpy-version: '1.23.*' + 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.*' + numpy-version: '2.0.*' - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_aarch64 - python-arch: 'aarch64' - python-version: '3.8' - numpy-version: '1.19.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 python-arch: 'aarch64' python-version: '3.9' - numpy-version: '1.19.*' + numpy-version: '2.0.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 python-arch: 'aarch64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '2.0.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 python-arch: 'aarch64' python-version: '3.11' - numpy-version: '1.23.*' + 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.*' + numpy-version: '2.0.*' - - os-image: macos-11 - os-name: mac - macos-min-version: '10.9' - python-arch: 'x86_64' - python-version: '3.8' - numpy-version: '1.17.*' - os-image: macos-11 os-name: mac macos-min-version: '10.9' python-arch: 'x86_64' python-version: '3.9' - numpy-version: '1.19.*' + numpy-version: '2.0.*' - os-image: macos-11 os-name: mac macos-min-version: '10.9' python-arch: 'x86_64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '2.0.*' - os-image: macos-11 os-name: mac macos-min-version: '10.9' python-arch: 'x86_64' python-version: '3.11' - numpy-version: '1.23.*' + numpy-version: '2.0.*' - os-image: macos-11 os-name: mac macos-min-version: '10.9' python-arch: 'x86_64' python-version: '3.12' - numpy-version: '1.26.*' + numpy-version: '2.0.*' + - os-image: macos-14 # M1 + os-name: mac + macos-min-version: '11.0' + python-arch: 'arm64' + python-version: '3.9' + numpy-version: '2.0.*' - os-image: macos-14 # M1 os-name: mac macos-min-version: '11.0' python-arch: 'arm64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '2.0.*' - os-image: macos-14 # M1 os-name: mac macos-min-version: '11.0' python-arch: 'arm64' python-version: '3.11' - numpy-version: '1.23.*' + 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.*' + numpy-version: '2.0.*' - - os-image: windows-2019 - os-name: windows - python-arch: 'x86_64' - python-version: '3.8' - numpy-version: '1.17.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' python-version: '3.9' - numpy-version: '1.19.*' + numpy-version: '2.0.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '2.0.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' python-version: '3.11' - numpy-version: '1.23.*' + numpy-version: '2.0.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' python-version: '3.12' - numpy-version: '1.26.*' + numpy-version: '2.0.*' runs-on: ${{ matrix.config.os-image }} @@ -231,143 +214,126 @@ jobs: # GitHub Actions doesn't support YAML anchors, # so this has to be duplicated here. config: - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_x86_64 - python-arch: 'x86_64' - python-version: '3.8' - numpy-version: '1.17.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_x86_64 python-arch: 'x86_64' python-version: '3.9' - numpy-version: '1.19.*' + 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.10' - numpy-version: '1.21.*' + 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.11' - numpy-version: '1.23.*' + 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.*' + numpy-version: '2.0.*' - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_aarch64 - python-arch: 'aarch64' - python-version: '3.8' - numpy-version: '1.19.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 python-arch: 'aarch64' python-version: '3.9' - numpy-version: '1.19.*' + numpy-version: '2.0.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 python-arch: 'aarch64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '2.0.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 python-arch: 'aarch64' python-version: '3.11' - numpy-version: '1.23.*' + 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.*' + numpy-version: '2.0.*' - - os-image: macos-11 - os-name: mac - macos-min-version: '10.9' - python-arch: 'x86_64' - python-version: '3.8' - numpy-version: '1.17.*' - os-image: macos-11 os-name: mac macos-min-version: '10.9' python-arch: 'x86_64' python-version: '3.9' - numpy-version: '1.19.*' + numpy-version: '2.0.*' - os-image: macos-11 os-name: mac macos-min-version: '10.9' python-arch: 'x86_64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '2.0.*' - os-image: macos-11 os-name: mac macos-min-version: '10.9' python-arch: 'x86_64' python-version: '3.11' - numpy-version: '1.23.*' + numpy-version: '2.0.*' - os-image: macos-11 os-name: mac macos-min-version: '10.9' python-arch: 'x86_64' python-version: '3.12' - numpy-version: '1.26.*' + numpy-version: '2.0.*' + - os-image: macos-14 # M1 + os-name: mac + macos-min-version: '11.0' + python-arch: 'arm64' + python-version: '3.9' + numpy-version: '2.0.*' - os-image: macos-14 # M1 os-name: mac macos-min-version: '11.0' python-arch: 'arm64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '2.0.*' - os-image: macos-14 # M1 os-name: mac macos-min-version: '11.0' python-arch: 'arm64' python-version: '3.11' - numpy-version: '1.23.*' + 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.*' + numpy-version: '2.0.*' - - os-image: windows-2019 - os-name: windows - python-arch: 'x86_64' - python-version: '3.8' - numpy-version: '1.17.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' python-version: '3.9' - numpy-version: '1.19.*' + numpy-version: '2.0.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' python-version: '3.10' - numpy-version: '1.21.*' + numpy-version: '2.0.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' python-version: '3.11' - numpy-version: '1.23.*' + numpy-version: '2.0.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' python-version: '3.12' - numpy-version: '1.26.*' + numpy-version: '2.0.*' runs-on: ${{ matrix.config.os-image }} diff --git a/rawpy/_version.py b/rawpy/_version.py index 6a726d8..5963297 100644 --- a/rawpy/_version.py +++ b/rawpy/_version.py @@ -1 +1 @@ -__version__ = "0.21.0" +__version__ = "0.22.0" diff --git a/setup.py b/setup.py index 0b1338a..ab078e7 100644 --- a/setup.py +++ b/setup.py @@ -308,5 +308,5 @@ def mac_libraw_compile(): packages = find_packages(), ext_modules = extensions, package_data = package_data, - install_requires=['numpy'] + install_requires=['numpy >= 2.0'] )