Skip to content

Commit 7052a6d

Browse files
Deprecate python 3.7 support on Linux, 3.9 is minimum now
1 parent df7b947 commit 7052a6d

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.github/workflows/build-and-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
runs-on: 'ubuntu-20.04'
128128
strategy:
129129
matrix:
130-
py_version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]
130+
py_version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
131131

132132
steps:
133133
- uses: actions/checkout@v3

OATFWGUI/gui_logic.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ def __init__(self, main_app: QWidget):
120120
def spawn_worker_thread(self, fn):
121121
@Slot()
122122
def worker_thread_slot():
123-
all_threads_removed = self.threadpool.waitForDone(msecs=5000)
123+
msecs = 5000
124+
all_threads_removed = self.threadpool.waitForDone(msecs)
124125
if not all_threads_removed:
125126
log.fatal(f'Waited too long for threads to sys.exit! {self.threadpool.activeThreadCount()}')
126127
sys.exit(1)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OpenAstroTech FirmWare Graphical User Interface -- A graphical way to build and
66
## Supported platforms
77
- Windows 64 bit
88
- Linux 64 bit
9-
- Requires Python 3.7..3.11, git, libc >= 2.28 (check with `ldd --version`)
9+
- Requires Python 3.9..3.13, git, libc >= 2.28 (check with `ldd --version`)
1010

1111
MacOS support [is in progress](https://github.com/OpenAstroTech/OATFWGUI/commits/feature/js/official-mac-support/), but isn't reliable yet.
1212

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
platformio==6.1.13
2-
PySide6-Essentials==6.5.3 # Last version that supports python 3.7
3-
requests~=2.28.1
1+
platformio==6.1.16 # Hard-pin version so that issues can be reproduced
2+
PySide6-Essentials~=6.8.1
3+
requests~=2.32.3
44
semver~=2.13.0
5-
pygments~=2.13.0
5+
pygments~=2.18.0

scripts/OATFWGUI_Linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
set -e
33
# This is the entry point for the "compiled" Linux app
44

5-
# list_include_item "10 11 12" "2"
65
function list_include_item {
76
local list="$1"
87
local item="$2"
@@ -32,6 +31,7 @@ function check_ldd_version {
3231
return 1
3332
fi
3433
# Only support >= 28
34+
# 2.28 from: https://doc.qt.io/qt-6/supported-platforms.html#availability-of-packages
3535
if [ "$LIBC_VER_MIN" -lt 28 ]; then
3636
echo "LIBC minor version $LIBC_VER_MIN ($LIBC_VER_ALL) is not supported"
3737
return 1
@@ -58,7 +58,7 @@ function check_py_version {
5858
return 1
5959
fi
6060
# Only support 3.7+
61-
if ! list_include_item '7 8 9 10 11' "$PY_VER_MIN"; then
61+
if ! list_include_item '9 10 11 12 13' "$PY_VER_MIN"; then
6262
echo "Python minor version $PY_VER_MIN ($PY_VER_ALL) is not supported"
6363
return 1
6464
fi

0 commit comments

Comments
 (0)