Skip to content
This repository was archived by the owner on Aug 31, 2025. It is now read-only.

Commit e4bbb38

Browse files
committed
Remove support for Python 3.5 & 3.6, add support for 3.9-3.11.
1 parent 046d78c commit e4bbb38

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

.github/workflows/test.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
timeout-minutes: 30
1212
strategy:
1313
matrix:
14-
os: [ubuntu-18.04, ubuntu-latest, macos-10.15, macos-latest, windows-2019, windows-latest]
15-
python-version: ['3.5', '3.6', '3.7', '3.8']
14+
os: [ubuntu-20.04, ubuntu-22.04, macos-10.15, macos-12, windows-2016, windows-2022]
15+
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11-dev']
1616
fail-fast: false
1717
runs-on: ${{ matrix.os }}
1818
name: Test Py ${{ matrix.python-version }} - ${{ matrix.os }}
@@ -33,17 +33,21 @@ jobs:
3333
pip freeze
3434
- name: Prepare Ubuntu
3535
if: runner.os == 'Linux'
36+
#sudo apt-get install -y libglu1 ffmpeg libsm6 libxext6 libgl1-mesa-glx libgl1 libglib2.0-0 libxkbcommon-x11-0 xvfb
37+
#sudo apt-get install -y libgl1-mesa-glx libxdamage1 libegl1 libxkbcommon0 libopengl0 libopengl-dev libxkbcommon-dev libegl-dev xvfb
38+
#sudo apt-get install -y libxcb-xinerama0 libegl1-mesa libegl1 libxkbcommon-x11-0 xvfb
39+
# This is needed for PyQt6 not to crash saying it's missing libGL.so.1 and libglib-2.0.so.0
3640
run: |
37-
sudo apt-get update
38-
sudo apt-get install -y libxkbcommon-x11-0 xvfb
41+
sudo apt update
42+
sudo apt install -y libgl1 libglib2.0-0
3943
- name: Install Mu dependencies
4044
run: |
4145
pip install .[dev]
4246
pip list
4347
timeout-minutes: 10
4448
- name: Run tests
4549
if: runner.os == 'Linux'
46-
run: xvfb-run make check
50+
run: QT_QPA_PLATFORM=offscreen python make.py test -s --verbose
4751
timeout-minutes: 5
4852
- name: Run tests
4953
if: runner.os != 'Linux'
@@ -57,16 +61,16 @@ jobs:
5761
- uses: actions/checkout@v2
5862
- name: Set up QEMU
5963
id: qemu
60-
uses: docker/setup-qemu-action@v1
64+
uses: docker/setup-qemu-action@v2
6165
with:
6266
image: tonistiigi/binfmt:latest
6367
platforms: 'linux/arm64,linux/arm/v7,linux/arm/v6'
6468
- name: Check Debian image info
65-
uses: docker://multiarch/debian-debootstrap:armhf-buster
69+
uses: docker://arm32v7/debian:bookworm
6670
with:
67-
args: /bin/bash -c "uname -a && cat /etc/os-release"
71+
args: bash -c "uname -a && cat /etc/os-release"
6872
- name: Install dependencies and run tests
69-
uses: docker://multiarch/debian-debootstrap:armhf-buster
73+
uses: docker://arm32v7/debian:bookworm
7074
with:
7175
args: >
7276
bash -c "
@@ -94,7 +98,7 @@ jobs:
9498
runs-on: ubuntu-latest
9599
strategy:
96100
matrix:
97-
docker-tag: ['stretch-2018-03-13', 'buster-2021-05-28', 'buster-legacy-2022-04-07']
101+
docker-tag: ['buster-2021-05-28', 'buster-legacy-2022-04-07']
98102
fail-fast: false
99103
services:
100104
rpios:

setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
#
2828
"PyQt6==6.3.1"
2929
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
30-
# Last version to support Python 3.6
31-
"PyQt6-QScintilla==2.13.2"
30+
"PyQt6-QScintilla==2.13.3"
3231
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
3332
"PyQt6-Charts==6.3.1"
3433
+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
@@ -59,7 +58,7 @@
5958
"flake8 >= 3.8.3",
6059
# Clamp click max version to workaround incompatibility with black<22.1.0
6160
"click<=8.0.4",
62-
"black>=19.10b0,<22.1.0;python_version>'3.5'",
61+
"black>=19.10b0,<22.1.0",
6362
"appdirs>=1.4.3",
6463
"semver>=2.8.0",
6564
# virtualenv vendors pip, we need at least pip v19.3 to install some
@@ -129,7 +128,7 @@
129128
"mu.modes.api",
130129
"mu.wheels",
131130
],
132-
python_requires=">=3.5,<3.9",
131+
python_requires=">=3.7,<3.12",
133132
install_requires=install_requires,
134133
extras_require=extras_require,
135134
package_data={"mu.wheels": ["*.whl", "*.zip"]},
@@ -148,10 +147,11 @@
148147
"Operating System :: MacOS :: MacOS X",
149148
"Operating System :: Microsoft :: Windows",
150149
"Programming Language :: Python :: 3 :: Only",
151-
"Programming Language :: Python :: 3.5",
152-
"Programming Language :: Python :: 3.6",
153150
"Programming Language :: Python :: 3.7",
154151
"Programming Language :: Python :: 3.8",
152+
"Programming Language :: Python :: 3.9",
153+
"Programming Language :: Python :: 3.10",
154+
"Programming Language :: Python :: 3.11",
155155
"Topic :: Education",
156156
"Topic :: Games/Entertainment",
157157
"Topic :: Software Development",

0 commit comments

Comments
 (0)