void-packages/srcpkgs/DisplayCAL/patches/python-3-12.patch at 7e90f351f5258cf8737439ef23ceb8660462d55a · void-linux/void-packages · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
From 0025940335eb1bd56f03f742aa095028d7ffa06f Mon Sep 17 00:00:00 2001
From: Erkan Ozgur Yilmaz <eoyilmaz@gmail.com>
Date: Sun, 24 Mar 2024 10:24:36 +0000
Subject: [PATCH] - Fixed #335

---
 .github/workflows/pytest.yml | 3 +++
 DisplayCAL/meta.py           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 02666a76..c9236a93 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -20,12 +20,15 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         wx-version:
           - "4.1.1"
           - "4.2.1"
         exclude:
           - python-version: "3.11"
             wx-version: "4.1.1"
+          - python-version: "3.12"
+            wx-version: "4.1.1"

     steps:

diff --git a/DisplayCAL/meta.py b/DisplayCAL/meta.py
index 30797cdf..fa52e733 100644
--- a/DisplayCAL/meta.py
+++ b/DisplayCAL/meta.py
@@ -62,7 +62,7 @@
 name_html = '<span class="appname">Display<span>CAL</span></span>'

 py_minversion = (3, 8)
-py_maxversion = (3, 11)
+py_maxversion = (3, 12)

 version = VERSION_STRING
 version_lin = VERSION_STRING  # Linux
commit 64336cdc9af0eb858ceeab0522bb9747008a8466
Author: Patrick Zwerschke <patrick@p5k.org>
Date:   Sun Mar 24 14:47:01 2024 +0100

    updated testing environment to python 3.12

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index c9236a93..16d19983 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -32,7 +32,7 @@ jobs:

     steps:

-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4

     - name: Set Environment Variables
       run: |
@@ -45,13 +45,10 @@ jobs:
           echo "add_dir_str=cpython-310" >> $GITHUB_ENV
         elif [ "${{ matrix.python-version }}" == "3.11" ]; then
           echo "add_dir_str=cpython-311" >> $GITHUB_ENV
+        elif [ "${{ matrix.python-version }}" == "3.12" ]; then
+          echo "add_dir_str=cpython-312" >> $GITHUB_ENV
         fi

-    - name: Setup timezone
-      uses: zcong1993/setup-timezone@master
-      with:
-        timezone: UTC
-
     - name: Setup xvfb
       run: |
         sudo apt-get update
@@ -69,7 +66,7 @@ jobs:
         sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &

     - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}

diff --git a/DisplayCAL/RealDisplaySizeMM.py b/DisplayCAL/RealDisplaySizeMM.py
index 25b730d0..e77dcb43 100644
--- a/DisplayCAL/RealDisplaySizeMM.py
+++ b/DisplayCAL/RealDisplaySizeMM.py
@@ -27,6 +27,8 @@ else:
         from DisplayCAL.lib64.python310.RealDisplaySizeMM import *
     elif sys.version_info[:2] == (3, 11):
         from DisplayCAL.lib64.python311.RealDisplaySizeMM import *
+    elif sys.version_info[:2] == (3, 12):
+        from DisplayCAL.lib64.python312.RealDisplaySizeMM import *
 # else:
 #     pass

diff --git a/DisplayCAL/lib64/python312/__init__.py b/DisplayCAL/lib64/python312/__init__.py
new file mode 100644
index 00000000..e69de29b