Skip to content

Add support for Python 3.14 and use latest libjpeg release #87

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

Merged
scaramallion merged 7 commits into from
Mar 7, 2026
Merged

Add support for Python 3.14 and use latest libjpeg release #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fc0165
Add support for Python 3.14 and use latest libjpeg release
scaramallion Mar 7, 2026
f8d1512
Use Python 3.11 when building wheels
scaramallion Mar 7, 2026
7b699bc
Fix file naming clash
scaramallion Mar 7, 2026
5a602b6
Really fix file naming clash
scaramallion Mar 7, 2026
12a12c2
Use newer macos runner for x86
scaramallion Mar 7, 2026
7da9349
Use even newer macos runner for x86
scaramallion Mar 7, 2026
0b38fb5
Finalise
scaramallion Mar 7, 2026
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
8 changes: 4 additions & 4 deletions .github/workflows/pytest-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.10', '3.11', '3.12', '3.13']
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
arch: ['x64', 'x86']

steps:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.10', '3.11', '3.12', '3.13']
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']

steps:
- uses: actions/checkout@v6
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.10', '3.11', '3.12', '3.13']
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']

steps:
- uses: actions/checkout@v6
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
pytest --cov=libjpeg --cov-append libjpeg/tests

- name: Switch to pydicom dev and rerun pytest
if: ${{ contains('3.10 3.11 3.12 3.13', matrix.python-version) }}
if: ${{ contains('3.10 3.11 3.12 3.13 3.14', matrix.python-version) }}
run: |
pip uninstall -y pydicom
pip install git+https://github.com/pydicom/pydicom
Expand Down
66 changes: 33 additions & 33 deletions .github/workflows/release-wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/setup-python@v6
name: Install Python
with:
python-version: '3.10'
python-version: '3.11'

- name: Build sdist
run: |
Expand All @@ -29,7 +29,7 @@ jobs:
poetry build -f sdist

- name: Store artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: sdist
path: ./dist
Expand All @@ -42,9 +42,6 @@ jobs:
matrix:
include:
# Windows 32 bit
- os: windows-latest
python: 39
platform_id: win32
- os: windows-latest
python: 310
platform_id: win32
Expand All @@ -57,11 +54,11 @@ jobs:
- os: windows-latest
python: 313
platform_id: win32
- os: windows-latest
python: 314
platform_id: win32

# Windows 64 bit
- os: windows-latest
python: 39
platform_id: win_amd64
- os: windows-latest
python: 310
platform_id: win_amd64
Expand All @@ -74,12 +71,11 @@ jobs:
- os: windows-latest
python: 313
platform_id: win_amd64
- os: windows-latest
python: 314
platform_id: win_amd64

# Linux 64 bit manylinux2014
- os: ubuntu-latest
python: 39
platform_id: manylinux_x86_64
manylinux_image: manylinux2014
- os: ubuntu-latest
python: 310
platform_id: manylinux_x86_64
Expand All @@ -96,11 +92,12 @@ jobs:
python: 313
platform_id: manylinux_x86_64
manylinux_image: manylinux2014
- os: ubuntu-latest
python: 314
platform_id: manylinux_x86_64
manylinux_image: manylinux2014

# Linux aarch64
- os: ubuntu-latest
python: 39
platform_id: manylinux_aarch64
- os: ubuntu-latest
python: 310
platform_id: manylinux_aarch64
Expand All @@ -113,23 +110,26 @@ jobs:
- os: ubuntu-latest
python: 313
platform_id: manylinux_aarch64
- os: ubuntu-latest
python: 314
platform_id: manylinux_aarch64

# MacOS x86_64
- os: macos-12
python: 39
platform_id: macosx_x86_64
- os: macos-12
- os: macos-26-intel
python: 310
platform_id: macosx_x86_64
- os: macos-12
- os: macos-26-intel
python: 311
platform_id: macosx_x86_64
- os: macos-12
- os: macos-26-intel
python: 312
platform_id: macosx_x86_64
- os: macos-12
- os: macos-26-intel
python: 313
platform_id: macosx_x86_64
- os: macos-26-intel
python: 314
platform_id: macosx_x86_64

steps:
- uses: actions/checkout@v6
Expand All @@ -145,12 +145,12 @@ jobs:
- uses: actions/setup-python@v6
name: Install Python
with:
python-version: '3.9'
python-version: '3.11'

- name: Install cibuildwheel
run: |
python -m pip install -U pip
python -m pip install cibuildwheel>=2.21
python -m pip install cibuildwheel>=3.4

- name: Build wheels
env:
Expand All @@ -165,7 +165,7 @@ jobs:
python -m cibuildwheel --output-dir dist

- name: Store artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: wheel-${{ matrix.python }}-${{ matrix.platform_id }}
path: ./dist
Expand All @@ -178,9 +178,6 @@ jobs:
matrix:
include:
# MacOS arm64
- os: macos-14
python: 39
platform_id: macosx_arm64
- os: macos-14
python: 310
platform_id: macosx_arm64
Expand All @@ -193,6 +190,9 @@ jobs:
- os: macos-14
python: 313
platform_id: macosx_arm64
- os: macos-14
python: 314
platform_id: macosx_arm64

steps:
- uses: actions/checkout@v6
Expand All @@ -202,10 +202,10 @@ jobs:
- uses: actions/setup-python@v6
name: Install Python
with:
python-version: '3.9'
python-version: '3.11'

- name: Install cibuildwheel
run: python -m pip install cibuildwheel>=2.21 wheel>=0.42
run: python -m pip install cibuildwheel>=3.4 wheel>=0.42

- name: Build wheels
env:
Expand All @@ -216,7 +216,7 @@ jobs:
python -m cibuildwheel --output-dir dist

- name: Store artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: wheel-${{ matrix.python }}-${{ matrix.platform_id }}
path: ./dist/*.whl
Expand All @@ -239,7 +239,7 @@ jobs:
# python-version: ${{ matrix.python-version }}
#
# - name: Download the wheels
# uses: actions/download-artifact@v7
# uses: actions/download-artifact@v8
# with:
# path: dist/
# merge-multiple: true
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:

steps:
- name: Download the wheels
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
path: dist/
merge-multiple: true
Expand Down
0 build.py → build_libjpeg.py
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions docs/changes/v2.4.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.. _v2.4.0:

2.4.0
=====

* Added support for Python 3.14 and dropped 3.9
* Updated to v1.71 of libjpeg
2 changes: 1 addition & 1 deletion lib/libjpeg
Open in desktop
Submodule libjpeg updated 16 files
+36 −1 README
+35 −0 README.history
+3 −5 codestream/aclosslessscan.cpp
+6 −2 codestream/entropyparser.cpp
+7 −1 codestream/entropyparser.hpp
+2 −2 codestream/image.cpp
+3 −5 codestream/losslessscan.cpp
+10 −1 codestream/predictivescan.cpp
+5 −1 codestream/predictivescan.hpp
+1 −2 codestream/sequentialscan.hpp
+19 −1 codestream/tables.cpp
+6 −1 codestream/tables.hpp
+10 −23 coding/huffmantemplate.cpp
+40 −5 marker/quantization.cpp
+11 −1 marker/quantization.hpp
+3 −11 marker/scan.cpp
10 changes: 5 additions & 5 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ requires = [
build-backend = "poetry.core.masonry.api"

[tool.poetry.build]
script = "build.py"
script = "build_libjpeg.py"
generate-setup-file = true


Expand All @@ -22,11 +22,11 @@ classifiers=[
"Development Status :: 5 - Production/Stable",
"Natural Language :: English",
"Programming Language :: C++",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Operating System :: MacOS :: MacOS X",
"Operating System :: POSIX :: Linux",
"Operating System :: Microsoft :: Windows",
Expand Down Expand Up @@ -56,10 +56,10 @@ packages = [
{ include = "libjpeg" },
]
readme = "README.md"
version = "2.3.0"
version = "2.4.0"

[tool.poetry.dependencies]
python = "^3.9"
python = "^3.10"
numpy = "^2.0"

[tool.poetry.plugins."pylibjpeg.jpeg_decoders"]
Expand All @@ -86,7 +86,7 @@ omit = [
]

[tool.mypy]
python_version = "3.9"
python_version = "3.10"
files = "libjpeg"
exclude = ["libjpeg/tests"]
show_error_codes = true
Expand Down