Skip to content

Commit b9434ea

Browse files
authored
Merge branch 'mathoudebine:main' into VerticalProgressBar
2 parents 3e2f172 + 30493e6 commit b9434ea

File tree

10 files changed

+19
-15
lines changed

10 files changed

+19
-15
lines changed

.github/workflows/simple-program-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
18+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
1919

2020
steps:
2121
- uses: actions/checkout@v6

.github/workflows/simple-program-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
18+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
1919

2020
steps:
2121
- uses: actions/checkout@v6

.github/workflows/system-monitor-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
18+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
1919
theme: [ "3.5inchTheme2" ]
2020

2121
steps:

.github/workflows/system-monitor-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
18+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
1919
theme: [ "3.5inchTheme2" ]
2020

2121
steps:

.github/workflows/themes-screenshot-on-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Python 3.x
1414
uses: actions/setup-python@v6
1515
with:
16-
python-version: "3.13"
16+
python-version: "3.14"
1717

1818
- name: Install dependencies
1919
run: |

.github/workflows/themes-screenshot-on-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Python 3.x
2626
uses: actions/setup-python@v6
2727
with:
28-
python-version: "3.13"
28+
python-version: "3.14"
2929

3030
- name: Install dependencies
3131
run: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This project is an open-source alternative software, NOT the original software p
99
* for other smart screens, contact your reseller
1010
---
1111

12-
![Linux](https://img.shields.io/badge/Linux-FCC624?style=for-the-badge&logo=linux&logoColor=black) ![Windows](https://img.shields.io/badge/Windows-0078D6?style=for-the-badge&logoColor=white&logo=data:image/svg%2bxml;base64,PHN2ZyByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dGl0bGU+V2luZG93czwvdGl0bGU+PHBhdGggZmlsbCA9ICIjRkZGRkZGIiBkPSJNMCwwSDExLjM3N1YxMS4zNzJIMFpNMTIuNjIzLDBIMjRWMTEuMzcySDEyLjYyM1pNMCwxMi42MjNIMTEuMzc3VjI0SDBabTEyLjYyMywwSDI0VjI0SDEyLjYyMyIvPjwvc3ZnPg==) [![macOS](https://img.shields.io/badge/mac%20os%20(⚠️major%20bug)-000000?style=for-the-badge&logo=apple&logoColor=white)](https://github.com/mathoudebine/turing-smart-screen-python/issues/7) ![Raspberry Pi](https://img.shields.io/badge/Raspberry%20Pi-A22846?style=for-the-badge&logo=Raspberry%20Pi&logoColor=white) ![Python](https://img.shields.io/badge/Python-3.9/3.13-3670A0?style=for-the-badge&logo=python&logoColor=ffdd54) [![Licence](https://img.shields.io/github/license/mathoudebine/turing-smart-screen-python?style=for-the-badge)](./LICENSE)
12+
![Linux](https://img.shields.io/badge/Linux-FCC624?style=for-the-badge&logo=linux&logoColor=black) ![Windows](https://img.shields.io/badge/Windows%2010%2F11-0078D6?style=for-the-badge&logoColor=white&logo=data:image/svg%2bxml;base64,PHN2ZyByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dGl0bGU+V2luZG93czwvdGl0bGU+PHBhdGggZmlsbCA9ICIjRkZGRkZGIiBkPSJNMCwwSDExLjM3N1YxMS4zNzJIMFpNMTIuNjIzLDBIMjRWMTEuMzcySDEyLjYyM1pNMCwxMi42MjNIMTEuMzc3VjI0SDBabTEyLjYyMywwSDI0VjI0SDEyLjYyMyIvPjwvc3ZnPg==) [![macOS](https://img.shields.io/badge/mac%20os%20(⚠️major%20bug)-000000?style=for-the-badge&logo=apple&logoColor=white)](https://github.com/mathoudebine/turing-smart-screen-python/issues/7) ![Raspberry Pi](https://img.shields.io/badge/Raspberry%20Pi-A22846?style=for-the-badge&logo=Raspberry%20Pi&logoColor=white) ![Python](https://img.shields.io/badge/Python-3.X-3670A0?style=for-the-badge&logo=python&logoColor=ffdd54) [![Licence](https://img.shields.io/github/license/mathoudebine/turing-smart-screen-python?style=for-the-badge)](./LICENSE)
1313

1414
A Python system monitor program and an abstraction library for **small IPS USB-C (UART) displays.**
1515

library/pythoncheck.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,19 @@
2424

2525
# Oldest / newest version supported
2626
MIN_PYTHON = (3, 9)
27-
MAX_PYTHON = (3, 13)
27+
MAX_PYTHON = (3, 14)
28+
# For Windows: max Python 3.13 until PythonNet support for 3.14
29+
MAX_PYTHON_WINDOWS = (3, 13)
2830

2931

3032
def check_python_version():
3133
current_version = sys.version_info[:2]
34+
platform = sys.platform
3235

33-
if current_version < MIN_PYTHON or current_version > MAX_PYTHON:
36+
if current_version < MIN_PYTHON or (platform == "win32" and current_version > MAX_PYTHON_WINDOWS) or (
37+
platform != "win32" and current_version > MAX_PYTHON):
3438
print(f"[ERROR] Python {current_version[0]}.{current_version[1]} is not supported by this program. "
35-
f"Python {MIN_PYTHON[0]}.{MIN_PYTHON[1]}-{MAX_PYTHON[0]}.{MAX_PYTHON[1]} required.")
39+
f"Python {MIN_PYTHON[0]}.{MIN_PYTHON[1]}-{MAX_PYTHON[0]}.{MAX_PYTHON[1]} required on platform {platform}.")
3640
try:
3741
sys.exit(0)
3842
except:

requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# Python packages requirements
22
pyserial~=3.5 # Serial link to communicate with the display
33
PyYAML~=6.0.3 # For themes files
4-
psutil~=7.2.1 # CPU / disk / network metrics
4+
psutil~=7.2.2 # CPU / disk / network metrics
55
pystray~=0.19.5 # Tray icon (all OS)
6-
babel~=2.17.0 # Date/time formatting
6+
babel~=2.18.0 # Date/time formatting
77
ruamel.yaml~=0.19.1 # For configuration editor
88
sv-ttk~=2.6.1 # Tk Sun Valley theme for configuration editor
99
tkinter-tooltip~=3.1.2 # Tooltips for configuration editor
1010
uptime~=3.0.1 # For System Uptime
1111
requests~=2.32.5 # HTTP library
1212
ping3~=5.1.5 # ICMP ping implementation using raw socket
13-
pyinstaller~=6.18.0 # bundles a Python application and all its dependencies into a single package
13+
pyinstaller~=6.19.0 # bundles a Python application and all its dependencies into a single package
1414

1515
# Image generation
1616
Pillow~=11.3.0; python_version < "3.10" # For Python 3.9, only Pillow 11.x is supported
17-
Pillow~=12.1.0; python_version >= "3.10" # For Python 3.10+, any Pillow 12.x is fine
17+
Pillow~=12.1.1; python_version >= "3.10" # For Python 3.10+, any Pillow 12.x is fine
1818

1919
# Efficient image serialization
2020
numpy~=2.0.2; python_version < "3.10" # For Python 3.9, only numpy 2.0.x is supported
2121
numpy~=2.2.6; python_version == "3.10" # For Python 3.10, only numpy 2.2.x is supported
22-
numpy~=2.4.1; python_version > "3.10" # For Python > 3.10, any numpy 2.x is fine
22+
numpy~=2.4.2; python_version > "3.10" # For Python > 3.10, any numpy 2.x is fine
2323

2424
# For Nvidia GPU on all platforms
2525
GPUtil~=1.4.0; python_version < "3.12"
147 Bytes
Loading

0 commit comments

Comments
 (0)