From 529b0f5827c2e8db847e81e13ec4c94262951196 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Sat, 22 Jun 2024 09:35:04 +0200 Subject: [PATCH 1/3] drop python 3.8, require numpy 2 --- .github/workflows/ci.yml | 64 ++++++++++++++++------------------------ setup.py | 2 +- 2 files changed, 27 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea4d8ab..bb64fcc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,143 +37,131 @@ 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.*' + numpy-version: '2.0.*' - 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/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'] ) From 55ea8372f075dc7cb84d870121e9df9df98d8180 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Sat, 22 Jun 2024 09:44:35 +0200 Subject: [PATCH 2/3] fix matrix --- .github/workflows/ci.yml | 72 ++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 47 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb64fcc..60e2af5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,11 +137,6 @@ jobs: python-version: '3.12' numpy-version: '2.0.*' - - os-image: windows-2019 - os-name: windows - python-arch: 'x86_64' - python-version: '3.8' - numpy-version: '2.0.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' @@ -219,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 }} From e207c95f7fbc169da4f38f8091384ca1230c25a0 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Sat, 22 Jun 2024 10:25:28 +0200 Subject: [PATCH 3/3] bump version --- rawpy/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"