Merge pull request #345 from mathoudebine/feature/update-workflows-to-python-3.12

mathoudebine · web-flow · commit f8910a63a2ba · 2023-10-31T00:33:28.000+01:00
diff --git a/.github/workflows/simple-program-linux.yml b/.github/workflows/simple-program-linux.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.12"]
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/simple-program-macos.yml b/.github/workflows/simple-program-macos.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.12"]
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/simple-program-windows.yml b/.github/workflows/simple-program-windows.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.12"]
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/system-monitor-linux.yml b/.github/workflows/system-monitor-linux.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.12"]
         theme: [ "3.5inchTheme2" ]
 
     steps:
diff --git a/.github/workflows/system-monitor-macos.yml b/.github/workflows/system-monitor-macos.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.12"]
         theme: [ "3.5inchTheme2" ]
 
     steps:
diff --git a/.github/workflows/system-monitor-windows.yml b/.github/workflows/system-monitor-windows.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.11"]
+        python-version: ["3.8", "3.12"]
         theme: [ "3.5inchTheme2" ]
 
     steps:
diff --git a/.gitignore b/.gitignore
@@ -109,6 +109,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+venv-*/
 
 # Spyder project settings
 .spyderproject
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This project is an open-source alternative software, NOT the original software p
 * for other smart screens, contact your reseller
 ---
 
-![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&logo=windows&logoColor=white) ![macOS](https://img.shields.io/badge/mac%20os-000000?style=for-the-badge&logo=apple&logoColor=white) ![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.8/3.11-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)
+![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&logo=windows&logoColor=white) ![macOS](https://img.shields.io/badge/mac%20os-000000?style=for-the-badge&logo=apple&logoColor=white) ![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.8/3.12-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)
   
 
 A Python system monitor program and an abstraction library for **small IPS USB-C (UART) displays.**    
diff --git a/requirements.txt b/requirements.txt
@@ -1,18 +1,25 @@
 # Python packages requirements
-Pillow~=10.1.0         # Image generation
-pyserial~=3.5         # Serial linl to communicate with the display
-numpy~=1.24.4         # Efficient image serialization
+Pillow~=10.1.0        # Image generation
+pyserial~=3.5         # Serial link to communicate with the display
 PyYAML~=6.0.1         # For themes files
 psutil~=5.9.6         # CPU / disk / network metrics
-GPUtil~=1.4.0         # Nvidia GPU
 pystray~=0.19.5       # Tray icon (all OS)
 babel~=2.13.1         # Date/time formatting
 ruamel.yaml~=0.17.40  # For configuration editor
 sv-ttk~=2.5.5         # Tk Sun Valley theme for configuration editor
 
+# Efficient image serialization
+numpy~=1.24.4; python_version < "3.9"   # For Python 3.8 max.
+numpy~=1.26.0; python_version >= "3.9"  # For Python 3.9+
+
+# For Nvidia GPU on all platforms
+GPUtil~=1.4.0; python_version < "3.12"
+# GPUtil is broken for Python 3.12+ and not maintained anymore: fetch it from a fork where it is fixed
+GPUtil @ git+https://github.com/mathoudebine/gputil.git@1.4.0-py3.12 ; python_version >= "3.12"
+
 # Following packages are for AMD GPU on Linux
-pyamdgpuinfo~=2.1.6; sys_platform=="linux" and python_version <= "3.11"
-# For Python > 3.11, you need to install pyamdgpuinfo manually: see https://github.com/mathoudebine/turing-smart-screen-python/wiki/Troubleshooting#linux--macos-no-supported-gpu-found-with-an-amd-gpu-and-python--311
+pyamdgpuinfo~=2.1.6; sys_platform=="linux" and python_version <= "3.12"
+# For Python > 3.12, you need to build install pyamdgpuinfo manually: see https://github.com/mathoudebine/turing-smart-screen-python/wiki/Troubleshooting#linux--macos-no-supported-gpu-found-with-an-amd-gpu-and-python--311
 
 # Following packages are for AMD GPU on Windows
 pyadl~=0.1; sys_platform=="win32"
