From d6a832a0a3e473a860635cc2784972902d29a271 Mon Sep 17 00:00:00 2001 From: Matthieu Houdebine Date: Wed, 18 Jan 2023 15:29:32 +0100 Subject: [PATCH 1/4] Add workflows for Python 3.11 --- .github/workflows/simple-program-linux.yml | 2 +- .github/workflows/simple-program-macos.yml | 2 +- .github/workflows/simple-program-windows.yml | 2 +- .github/workflows/system-monitor-linux.yml | 2 +- .github/workflows/system-monitor-macos.yml | 2 +- .github/workflows/system-monitor-windows.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/simple-program-linux.yml b/.github/workflows/simple-program-linux.yml index 442cbb1e..935bf9d5 100644 --- a/.github/workflows/simple-program-linux.yml +++ b/.github/workflows/simple-program-linux.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/simple-program-macos.yml b/.github/workflows/simple-program-macos.yml index 9754d525..b12a1c18 100644 --- 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.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/simple-program-windows.yml b/.github/workflows/simple-program-windows.yml index 0c443e63..d0054f22 100644 --- 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.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/system-monitor-linux.yml b/.github/workflows/system-monitor-linux.yml index e86a723e..9ecbd00e 100644 --- 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.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", "LandscapeMagicBlue" ] steps: diff --git a/.github/workflows/system-monitor-macos.yml b/.github/workflows/system-monitor-macos.yml index 47255b81..d4b0f1a1 100644 --- 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.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", "LandscapeMagicBlue" ] steps: diff --git a/.github/workflows/system-monitor-windows.yml b/.github/workflows/system-monitor-windows.yml index 5d660520..2d8cfa7b 100644 --- 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.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", "LandscapeMagicBlue" ] steps: From e5ccd0256d567371d1cc68a357d266764a21c0af Mon Sep 17 00:00:00 2001 From: Matthieu Houdebine Date: Wed, 18 Jan 2023 15:30:59 +0100 Subject: [PATCH 2/4] Add new theme to workflows --- .github/workflows/system-monitor-linux.yml | 3 ++- .github/workflows/system-monitor-macos.yml | 3 ++- .github/workflows/system-monitor-windows.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/system-monitor-linux.yml b/.github/workflows/system-monitor-linux.yml index 9ecbd00e..95502c01 100644 --- a/.github/workflows/system-monitor-linux.yml +++ b/.github/workflows/system-monitor-linux.yml @@ -16,7 +16,8 @@ jobs: fail-fast: false matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", "LandscapeMagicBlue" ] + theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", + "LandscapeMagicBlue", "BigClock" ] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/system-monitor-macos.yml b/.github/workflows/system-monitor-macos.yml index d4b0f1a1..8f32753e 100644 --- a/.github/workflows/system-monitor-macos.yml +++ b/.github/workflows/system-monitor-macos.yml @@ -16,7 +16,8 @@ jobs: fail-fast: false matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", "LandscapeMagicBlue" ] + theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", + "LandscapeMagicBlue", "BigClock" ] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/system-monitor-windows.yml b/.github/workflows/system-monitor-windows.yml index 2d8cfa7b..30088467 100644 --- a/.github/workflows/system-monitor-windows.yml +++ b/.github/workflows/system-monitor-windows.yml @@ -16,7 +16,8 @@ jobs: fail-fast: false matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", "LandscapeMagicBlue" ] + theme: [ "3.5inchTheme2", "Cyberpunk", "Landscape6Grid", "Terminal", "bash-dark-green", "bash-dark-green-gpu", + "LandscapeMagicBlue", "BigClock" ] steps: - uses: actions/checkout@v3 From 5c6d630dc0d5c7f9cb0f0ad357a216f8f7bc5672 Mon Sep 17 00:00:00 2001 From: Matthieu Houdebine Date: Wed, 18 Jan 2023 17:18:04 +0100 Subject: [PATCH 3/4] Avoid "ModuleNotFoundError: No module named 'Cython'" when installing pyamdgpuinfo with Python 3.11 --- .github/workflows/simple-program-linux.yml | 5 +++++ .github/workflows/system-monitor-linux.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/.github/workflows/simple-program-linux.yml b/.github/workflows/simple-program-linux.yml index 935bf9d5..bdc941f6 100644 --- a/.github/workflows/simple-program-linux.yml +++ b/.github/workflows/simple-program-linux.yml @@ -28,6 +28,11 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + + # Fix for pyamdgpuinfo with Python 3.11 + python -m pip install Cython # Cython must be installed first manually + sudo apt-get install -y libdrm-dev # For "xf86drm.h" + python -m pip install -r requirements.txt - name: Run simple-program.py during 20 seconds diff --git a/.github/workflows/system-monitor-linux.yml b/.github/workflows/system-monitor-linux.yml index 95502c01..12e1e576 100644 --- a/.github/workflows/system-monitor-linux.yml +++ b/.github/workflows/system-monitor-linux.yml @@ -29,6 +29,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + python -m pip install Cython # Because of a bug with Python 3.11, Cython must be installed first manually python -m pip install -r requirements.txt - name: Configure system monitor From 210ea3ac6a12950b9658bc2e915a06bb2c70f1dc Mon Sep 17 00:00:00 2001 From: Matthieu Houdebine Date: Wed, 18 Jan 2023 17:58:12 +0100 Subject: [PATCH 4/4] Do not install pyamdgpuinfo for Python 3.11+ until wheel package is published --- .github/workflows/simple-program-linux.yml | 5 ----- .github/workflows/system-monitor-linux.yml | 1 - requirements.txt | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/simple-program-linux.yml b/.github/workflows/simple-program-linux.yml index bdc941f6..935bf9d5 100644 --- a/.github/workflows/simple-program-linux.yml +++ b/.github/workflows/simple-program-linux.yml @@ -28,11 +28,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - - # Fix for pyamdgpuinfo with Python 3.11 - python -m pip install Cython # Cython must be installed first manually - sudo apt-get install -y libdrm-dev # For "xf86drm.h" - python -m pip install -r requirements.txt - name: Run simple-program.py during 20 seconds diff --git a/.github/workflows/system-monitor-linux.yml b/.github/workflows/system-monitor-linux.yml index 12e1e576..95502c01 100644 --- a/.github/workflows/system-monitor-linux.yml +++ b/.github/workflows/system-monitor-linux.yml @@ -29,7 +29,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install Cython # Because of a bug with Python 3.11, Cython must be installed first manually python -m pip install -r requirements.txt - name: Configure system monitor diff --git a/requirements.txt b/requirements.txt index 16953f99..c331f6ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ pystray~=0.19.4 # Tray icon (all OS) # Following packages are for AMD GPU on Linux # Note: you may need to manually install Cython first Cython~=0.29.32; sys_platform=="linux" -pyamdgpuinfo~=2.1.3; sys_platform=="linux" +pyamdgpuinfo~=2.1.3; sys_platform=="linux" and python_version < "3.11" # Wheel package not yet available for Python 3.11+ # Following packages are for AMD GPU on Windows pyadl~=0.1; sys_platform=="win32"