Skip to content

Commit 1a4875c

Browse files
authored
Merge branch 'mathoudebine:main' into VerticalProgressBar
2 parents b9434ea + 8df0b43 commit 1a4875c

11 files changed

+18
-15
lines changed

.github/workflows/generate-windows-packages-debug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
7z a -tzip turing-system-monitor-${{github.event.release.tag_name}}-portable-debug.zip ".\dist\turing-system-monitor"
4848
4949
- name: '📦 Archive Windows installer'
50-
uses: actions/upload-artifact@v6
50+
uses: actions/upload-artifact@v7
5151
with:
5252
name: turing-system-monitor-${{github.event.release.tag_name}}-debug
5353
path: tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}-debug.exe
5454
if-no-files-found: error
5555

5656
- name: '📦 Archive Windows portable archive'
57-
uses: actions/upload-artifact@v6
57+
uses: actions/upload-artifact@v7
5858
with:
5959
name: turing-system-monitor-${{github.event.release.tag_name}}-portable-debug
6060
path: turing-system-monitor-${{github.event.release.tag_name}}-portable-debug.zip

.github/workflows/generate-windows-packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
7z a -tzip turing-system-monitor-${{github.event.release.tag_name}}-portable.zip ".\dist\turing-system-monitor"
4848
4949
- name: '📦 Archive Windows installer'
50-
uses: actions/upload-artifact@v6
50+
uses: actions/upload-artifact@v7
5151
with:
5252
name: turing-system-monitor-${{github.event.release.tag_name}}
5353
path: tools\windows-installer\Output\turing-system-monitor-${{github.event.release.tag_name}}.exe
5454
if-no-files-found: error
5555

5656
- name: '📦 Archive Windows portable archive'
57-
uses: actions/upload-artifact@v6
57+
uses: actions/upload-artifact@v7
5858
with:
5959
name: turing-system-monitor-${{github.event.release.tag_name}}-portable
6060
path: turing-system-monitor-${{github.event.release.tag_name}}-portable.zip

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
cp screencap.png screenshot-py${{ matrix.python-version }}.png
6060
6161
- name: Archive a screenshot
62-
uses: actions/upload-artifact@v6
62+
uses: actions/upload-artifact@v7
6363
with:
6464
name: screenshot-py${{ matrix.python-version }}
6565
path: screenshot-*.png

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
cp screencap.png screenshot-py${{ matrix.python-version }}.png
6060
6161
- name: Archive a screenshot
62-
uses: actions/upload-artifact@v6
62+
uses: actions/upload-artifact@v7
6363
with:
6464
name: screenshot-py${{ matrix.python-version }}
6565
path: screenshot-*.png

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
cp screencap.png screenshot-py${{ matrix.python-version }}.png
6666
6767
- name: Archive a screenshot
68-
uses: actions/upload-artifact@v6
68+
uses: actions/upload-artifact@v7
6969
with:
7070
name: screenshot-py${{ matrix.python-version }}
7171
path: screenshot-*.png

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
cp screencap.png screenshot-py${{ matrix.python-version }}-${{ matrix.theme }}.png
6666
6767
- name: Archive a screenshot
68-
uses: actions/upload-artifact@v6
68+
uses: actions/upload-artifact@v7
6969
with:
7070
name: screenshot-py${{ matrix.python-version }}-${{ matrix.theme }}
7171
path: screenshot-*.png

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
cp screencap.png screenshot-py${{ matrix.python-version }}-${{ matrix.theme }}.png
6666
6767
- name: Archive a screenshot
68-
uses: actions/upload-artifact@v6
68+
uses: actions/upload-artifact@v7
6969
with:
7070
name: screenshot-py${{ matrix.python-version }}-${{ matrix.theme }}
7171
path: screenshot-*.png

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
cp screencap.png screenshot-py${{ matrix.python-version }}-${{ matrix.theme }}.png
7272
7373
- name: Archive a screenshot
74-
uses: actions/upload-artifact@v6
74+
uses: actions/upload-artifact@v7
7575
with:
7676
name: screenshot-py${{ matrix.python-version }}-${{ matrix.theme }}
7777
path: screenshot-*.png

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
done
6060

6161
- name: Archive screenshots
62-
uses: actions/upload-artifact@v6
62+
uses: actions/upload-artifact@v7
6363
with:
6464
name: themes-screenshots
6565
path: |

requirements.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,22 @@ 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
10-
uptime~=3.0.1 # For System Uptime
11-
requests~=2.32.5 # HTTP library
10+
uptime~=3.0.1 # For System Uptime
1211
ping3~=5.1.5 # ICMP ping implementation using raw socket
1312
pyinstaller~=6.19.0 # bundles a Python application and all its dependencies into a single package
1413

14+
# HTTP library
15+
requests~=2.32.5; python_version < "3.10"
16+
requests~=2.33.1; python_version >= "3.10"
17+
1518
# Image generation
1619
Pillow~=11.3.0; python_version < "3.10" # For Python 3.9, only Pillow 11.x is supported
17-
Pillow~=12.1.1; python_version >= "3.10" # For Python 3.10+, any Pillow 12.x is fine
20+
Pillow~=12.2.0; python_version >= "3.10" # For Python 3.10+, any Pillow 12.x is fine
1821

1922
# Efficient image serialization
2023
numpy~=2.0.2; python_version < "3.10" # For Python 3.9, only numpy 2.0.x is supported
2124
numpy~=2.2.6; python_version == "3.10" # For Python 3.10, only numpy 2.2.x is supported
22-
numpy~=2.4.2; python_version > "3.10" # For Python > 3.10, any numpy 2.x is fine
25+
numpy~=2.4.4; python_version > "3.10" # For Python > 3.10, any numpy 2.x is fine
2326

2427
# For Nvidia GPU on all platforms
2528
GPUtil~=1.4.0; python_version < "3.12"

0 commit comments

Comments
 (0)