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.

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

[#421] Added support for Python 3.13. #423

Merged
merged 4 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- "3.10"
- "3.11"
- "3.12"
- "3.13"
wx-version:
- "4.1.1"
- "4.2.1"
Expand All @@ -32,6 +33,10 @@ jobs:
wx-version: "4.1.1"
- python-version: "3.12"
wx-version: "4.2.1"
- python-version: "3.13"
wx-version: "4.1.1"
- python-version: "3.13"
wx-version: "4.2.1"

steps:

Expand All @@ -50,6 +55,8 @@ jobs:
echo "add_dir_str=cpython-311" >> $GITHUB_ENV
elif [ "${{ matrix.python-version }}" == "3.12" ]; then
echo "add_dir_str=cpython-312" >> $GITHUB_ENV
elif [ "${{ matrix.python-version }}" == "3.13" ]; then
echo "add_dir_str=cpython-313" >> $GITHUB_ENV
fi

- name: Setup xvfb
Expand Down
4 changes: 2 additions & 2 deletions DisplayCAL/RealDisplaySizeMM.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
from DisplayCAL.lib64.python311.RealDisplaySizeMM import *
elif sys.version_info[:2] == (3, 12):
from DisplayCAL.lib64.python312.RealDisplaySizeMM import *
# else:
# pass
elif sys.version_info[:2] == (3, 13):
from DisplayCAL.lib64.python313.RealDisplaySizeMM import *

# TODO: For Linux use the ``xrandr`` command output which supplies everything.
#
Expand Down
3 changes: 2 additions & 1 deletion DisplayCAL/freeze.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def add_lib_excludes(key, excludebits):
config["excludes"][key].extend([f"{name}.lib{exclude}", f"lib{exclude}"])

for exclude in ("32", "64"):
for pycompat in ("38", "39", "310", "311"):
for pycompat in ("38", "39", "310", "311", "312", "313"):
if key == "win32" and (
pycompat == str(sys.version_info[0]) + str(sys.version_info[1])
or exclude == excludebits[0]
Expand Down Expand Up @@ -463,6 +463,7 @@ def build_py2exe():
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Multimedia :: Graphics",
],
"data_files": data_files,
Expand Down
Empty file.
2 changes: 1 addition & 1 deletion DisplayCAL/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
name_html = '<span class="appname">Display<span>CAL</span></span>'

py_minversion = (3, 8)
py_maxversion = (3, 12)
py_maxversion = (3, 13)

version = VERSION_STRING
version_lin = VERSION_STRING # Linux
Expand Down
2 changes: 1 addition & 1 deletion DisplayCAL/safe_print.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import os
import sys

from DisplayCAL.encoding import get_encoding, get_encodings
from DisplayCAL.encoding import get_encodings


original_codepage = None
Expand Down
5 changes: 3 additions & 2 deletions DisplayCAL/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def add_lib_excludes(key, excludebits):
config["excludes"][key].extend([f"{name}.lib{exclude}", f"lib{exclude}"])

for exclude in ("32", "64"):
for pycompat in ("38", "39", "310", "311", "312"):
for pycompat in ("38", "39", "310", "311", "312", "313"):
if key == "win32" and (
pycompat == str(sys.version_info[0]) + str(sys.version_info[1])
or exclude == excludebits[0]
Expand Down Expand Up @@ -990,7 +990,7 @@ def findall(
packages = [name, f"{name}.lib", f"{name}.lib.agw"]
if sdist:
# For source distributions we want all libraries
for pycompat in ("38", "39", "310", "311", "312"):
for pycompat in ("38", "39", "310", "311", "312", "313"):
packages.extend([f"{name}.lib{bits}", f"{name}.lib{bits}.python{pycompat}"])
elif sys.platform == "darwin":
# On Mac OS X we only want the universal binaries
Expand Down Expand Up @@ -1023,6 +1023,7 @@ def findall(
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Multimedia :: Graphics",
],
"data_files": data_files,
Expand Down
1 change: 0 additions & 1 deletion DisplayCAL/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import math
import mimetypes
import os
import pipes
from io import BytesIO
from pathlib import Path

Expand Down
1 change: 0 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ pytest-github-actions-annotate-failures
pytest-xdist
snowballstemmer
twine
yappi
wheel