From 85a346e19be599e031f4715f25bdc9cdd18da3a5 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Fri, 8 Dec 2023 08:54:38 +0000 Subject: [PATCH 1/5] add python 3.12 to CI --- .github/workflows/ci.yml | 46 ++++++++++++++++++++++++++++++++++++++++ rawpy/_version.py | 2 +- setup.py | 5 ----- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 394bbea..2740d2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,6 +67,12 @@ jobs: python-arch: 'x86_64' python-version: '3.11' numpy-version: '1.23.*' + - 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.*' - os-image: ubuntu-latest os-name: linux @@ -98,6 +104,12 @@ jobs: python-arch: 'aarch64' python-version: '3.11' numpy-version: '1.23.*' + - 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.*' - os-image: macos-latest os-name: mac @@ -129,6 +141,12 @@ jobs: python-arch: 'x86_64' python-version: '3.11' numpy-version: '1.23.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'x86_64' + python-version: '3.12' + numpy-version: '1.26.*' - os-image: windows-2019 os-name: windows @@ -155,6 +173,11 @@ jobs: python-arch: 'x86_64' python-version: '3.11' numpy-version: '1.23.*' + - os-image: windows-2019 + os-name: windows + python-arch: 'x86_64' + python-version: '3.12' + numpy-version: '1.26.*' runs-on: ${{ matrix.config.os-image }} @@ -242,6 +265,12 @@ jobs: python-arch: 'x86_64' python-version: '3.11' numpy-version: '1.23.*' + - 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.*' - os-image: ubuntu-latest os-name: linux @@ -273,6 +302,12 @@ jobs: python-arch: 'aarch64' python-version: '3.11' numpy-version: '1.23.*' + - 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.*' - os-image: macos-latest os-name: mac @@ -304,6 +339,12 @@ jobs: python-arch: 'x86_64' python-version: '3.11' numpy-version: '1.23.*' + - os-image: macos-latest + os-name: mac + macos-min-version: '10.9' + python-arch: 'x86_64' + python-version: '3.12' + numpy-version: '1.26.*' - os-image: windows-2019 os-name: windows @@ -330,6 +371,11 @@ jobs: python-arch: 'x86_64' python-version: '3.11' numpy-version: '1.23.*' + - os-image: windows-2019 + os-name: windows + python-arch: 'x86_64' + python-version: '3.12' + numpy-version: '1.26.*' runs-on: ${{ matrix.config.os-image }} diff --git a/rawpy/_version.py b/rawpy/_version.py index e9fa21e..11ac8e1 100644 --- a/rawpy/_version.py +++ b/rawpy/_version.py @@ -1 +1 @@ -__version__ = "0.18.1" +__version__ = "0.19.0" diff --git a/setup.py b/setup.py index 5e5571d..bc12183 100644 --- a/setup.py +++ b/setup.py @@ -298,11 +298,6 @@ def mac_libraw_compile(): 'License :: OSI Approved :: MIT License', 'Programming Language :: Cython', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', 'Operating System :: MacOS', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', From 8f361690779878c35b24ff2f33fee4fc116fcaec Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Fri, 8 Dec 2023 09:00:59 +0000 Subject: [PATCH 2/5] fix --- .github/scripts/build-linux.sh | 2 ++ .github/scripts/build-windows.ps1 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/build-linux.sh b/.github/scripts/build-linux.sh index 4c9bd18..1a75d33 100755 --- a/.github/scripts/build-linux.sh +++ b/.github/scripts/build-linux.sh @@ -20,6 +20,8 @@ elif [ $PYTHON_VERSION == "3.10" ]; then PYBIN="/opt/python/cp310-cp310/bin" elif [ $PYTHON_VERSION == "3.11" ]; then PYBIN="/opt/python/cp311-cp311/bin" +elif [ $PYTHON_VERSION == "3.12" ]; then + PYBIN="/opt/python/cp312-cp312/bin" else echo "Unsupported Python version $PYTHON_VERSION" exit 1 diff --git a/.github/scripts/build-windows.ps1 b/.github/scripts/build-windows.ps1 index c3ea1df..7a60a4b 100644 --- a/.github/scripts/build-windows.ps1 +++ b/.github/scripts/build-windows.ps1 @@ -119,7 +119,7 @@ Get-ChildItem env: # Install vcpkg and build dependencies if (!(Test-Path ./vcpkg)) { - exec { git clone https://github.com/microsoft/vcpkg -b 2023.04.15 --depth 1} + exec { git clone https://github.com/microsoft/vcpkg -b 2023.11.20 --depth 1} exec { ./vcpkg/bootstrap-vcpkg } } exec { ./vcpkg/vcpkg install zlib libjpeg-turbo[jpeg8] jasper lcms --triplet=x64-windows-static --recurse } From d37d0930fdef1567dfe5b5b6030f2c9a39e6c366 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Fri, 8 Dec 2023 09:24:26 +0000 Subject: [PATCH 3/5] install setuptools --- .github/scripts/build-macos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/build-macos.sh b/.github/scripts/build-macos.sh index 8e59e5c..63957bc 100755 --- a/.github/scripts/build-macos.sh +++ b/.github/scripts/build-macos.sh @@ -31,7 +31,7 @@ set -x popd # Install dependencies -pip install numpy==$NUMPY_VERSION cython wheel delocate +pip install numpy==$NUMPY_VERSION cython wheel delocate setuptools # List installed packages pip freeze From 3e7d00a65e72910432af5af69f0a795021a96ec0 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Fri, 8 Dec 2023 14:01:22 +0000 Subject: [PATCH 4/5] fix --- .github/scripts/build-macos.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/build-macos.sh b/.github/scripts/build-macos.sh index 63957bc..200672a 100755 --- a/.github/scripts/build-macos.sh +++ b/.github/scripts/build-macos.sh @@ -21,7 +21,8 @@ export PYTHON_INSTALLER_MACOS_VERSION=$MACOS_MIN_VERSION # Instead we install python.org binaries which are built with 10.6/10.9 target # and hence provide wider compatibility for the wheels we create. # See https://github.com/actions/setup-python/issues/26. -git clone https://github.com/multi-build/multibuild.git +#git clone https://github.com/multi-build/multibuild.git +git clone https://github.com/matthew-brett/multibuild.git -b python-on-macos pushd multibuild set +x # reduce noise source osx_utils.sh From ca3399768661aa2f6345482b5a397cb12f62ae91 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Fri, 8 Dec 2023 18:00:17 +0000 Subject: [PATCH 5/5] final fixes, drop py 3.7 --- .github/scripts/build-linux.sh | 4 +-- .github/scripts/build-macos.sh | 3 +-- .github/scripts/test-linux.sh | 6 ++--- .github/workflows/ci.yml | 46 ---------------------------------- 4 files changed, 5 insertions(+), 54 deletions(-) diff --git a/.github/scripts/build-linux.sh b/.github/scripts/build-linux.sh index 1a75d33..5ee8374 100755 --- a/.github/scripts/build-linux.sh +++ b/.github/scripts/build-linux.sh @@ -10,9 +10,7 @@ CHECK_SHA256=.github/scripts/check_sha256.sh # List python versions ls /opt/python -if [ $PYTHON_VERSION == "3.7" ]; then - PYBIN="/opt/python/cp37-cp37m/bin" -elif [ $PYTHON_VERSION == "3.8" ]; then +if [ $PYTHON_VERSION == "3.8" ]; then PYBIN="/opt/python/cp38-cp38/bin" elif [ $PYTHON_VERSION == "3.9" ]; then PYBIN="/opt/python/cp39-cp39/bin" diff --git a/.github/scripts/build-macos.sh b/.github/scripts/build-macos.sh index 200672a..63957bc 100755 --- a/.github/scripts/build-macos.sh +++ b/.github/scripts/build-macos.sh @@ -21,8 +21,7 @@ export PYTHON_INSTALLER_MACOS_VERSION=$MACOS_MIN_VERSION # Instead we install python.org binaries which are built with 10.6/10.9 target # and hence provide wider compatibility for the wheels we create. # See https://github.com/actions/setup-python/issues/26. -#git clone https://github.com/multi-build/multibuild.git -git clone https://github.com/matthew-brett/multibuild.git -b python-on-macos +git clone https://github.com/multi-build/multibuild.git pushd multibuild set +x # reduce noise source osx_utils.sh diff --git a/.github/scripts/test-linux.sh b/.github/scripts/test-linux.sh index 3e1538f..fa02bbf 100755 --- a/.github/scripts/test-linux.sh +++ b/.github/scripts/test-linux.sh @@ -6,9 +6,7 @@ cd /io # List python versions ls /opt/python -if [ $PYTHON_VERSION == "3.7" ]; then - PYBIN="/opt/python/cp37-cp37m/bin" -elif [ $PYTHON_VERSION == "3.8" ]; then +if [ $PYTHON_VERSION == "3.8" ]; then PYBIN="/opt/python/cp38-cp38/bin" elif [ $PYTHON_VERSION == "3.9" ]; then PYBIN="/opt/python/cp39-cp39/bin" @@ -16,6 +14,8 @@ elif [ $PYTHON_VERSION == "3.10" ]; then PYBIN="/opt/python/cp310-cp310/bin" elif [ $PYTHON_VERSION == "3.11" ]; then PYBIN="/opt/python/cp311-cp311/bin" +elif [ $PYTHON_VERSION == "3.12" ]; then + PYBIN="/opt/python/cp312-cp312/bin" else echo "Unsupported Python version $PYTHON_VERSION" exit 1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2740d2e..d6b3c25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,12 +37,6 @@ 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.7' - numpy-version: '1.14.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_x86_64 @@ -74,12 +68,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_aarch64 - python-arch: 'aarch64' - python-version: '3.7' - numpy-version: '1.19.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 @@ -111,12 +99,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: macos-latest - os-name: mac - macos-min-version: '10.9' - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: macos-latest os-name: mac macos-min-version: '10.9' @@ -148,11 +130,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: windows-2019 - os-name: windows - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64' @@ -235,12 +212,6 @@ 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.7' - numpy-version: '1.14.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_x86_64 @@ -272,12 +243,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: ubuntu-latest - os-name: linux - docker-image: quay.io/pypa/manylinux2014_aarch64 - python-arch: 'aarch64' - python-version: '3.7' - numpy-version: '1.19.*' - os-image: ubuntu-latest os-name: linux docker-image: quay.io/pypa/manylinux2014_aarch64 @@ -309,12 +274,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: macos-latest - os-name: mac - macos-min-version: '10.9' - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: macos-latest os-name: mac macos-min-version: '10.9' @@ -346,11 +305,6 @@ jobs: python-version: '3.12' numpy-version: '1.26.*' - - os-image: windows-2019 - os-name: windows - python-arch: 'x86_64' - python-version: '3.7' - numpy-version: '1.14.*' - os-image: windows-2019 os-name: windows python-arch: 'x86_64'