Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

+3.12 -3.7 support #214

Merged
merged 5 commits into from
Dec 8, 2023
+53 −58
Merged

+3.12 -3.7 support #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85a346e
add python 3.12 to CI
letmaik Dec 8, 2023
8f36169
fix
letmaik Dec 8, 2023
d37d093
install setuptools
letmaik Dec 8, 2023
3e7d00a
fix
letmaik Dec 8, 2023
ca33997
final fixes, drop py 3.7
letmaik Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/scripts/build-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/build-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/build-windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 3 additions & 3 deletions .github/scripts/test-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
88 changes: 44 additions & 44 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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 }}

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion rawpy/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.18.1"
__version__ = "0.19.0"
5 changes: 0 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading