+3.12 -3.7 support (#214)

letmaik · Dec 8, 2023 · 6c8f386 · 6c8f386
1 parent 65a8f73
commit 6c8f386
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 58 deletions.
diff --git a/.github/scripts/build-linux.sh b/.github/scripts/build-linux.sh
@@ -10,16 +10,16 @@ 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"
 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-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

diff --git 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 }

diff --git a/.github/scripts/test-linux.sh b/.github/scripts/test-linux.sh
@@ -6,16 +6,16 @@ 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"
 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
@@ -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
@@ -67,13 +61,13 @@ 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_aarch64
-          python-arch: 'aarch64'
-          python-version: '3.7'
-          numpy-version: '1.19.*'
+          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
           docker-image: quay.io/pypa/manylinux2014_aarch64
@@ -98,13 +92,13 @@ 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
-          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'
@@ -129,12 +123,13 @@ jobs:
           python-arch: 'x86_64'
           python-version: '3.11'
           numpy-version: '1.23.*'
-
-        - os-image: windows-2019
-          os-name: windows
+        - os-image: macos-latest
+          os-name: mac
+          macos-min-version: '10.9'
           python-arch: 'x86_64'
-          python-version: '3.7'
-          numpy-version: '1.14.*'
+          python-version: '3.12'
+          numpy-version: '1.26.*'
+
         - os-image: windows-2019
           os-name: windows
           python-arch: 'x86_64'
@@ -155,6 +150,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 }}
 
@@ -212,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
@@ -242,13 +236,13 @@ 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_aarch64
-          python-arch: 'aarch64'
-          python-version: '3.7'
-          numpy-version: '1.19.*'
+          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
           docker-image: quay.io/pypa/manylinux2014_aarch64
@@ -273,13 +267,13 @@ 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
-          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'
@@ -304,12 +298,13 @@ jobs:
           python-arch: 'x86_64'
           python-version: '3.11'
           numpy-version: '1.23.*'
-
-        - os-image: windows-2019
-          os-name: windows
+        - os-image: macos-latest
+          os-name: mac
+          macos-min-version: '10.9'
           python-arch: 'x86_64'
-          python-version: '3.7'
-          numpy-version: '1.14.*'
+          python-version: '3.12'
+          numpy-version: '1.26.*'
+
         - os-image: windows-2019
           os-name: windows
           python-arch: 'x86_64'
@@ -330,6 +325,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
@@ -1 +1 @@
-__version__ = "0.18.1"
+__version__ = "0.19.0"
diff --git 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',