Remove support for Python 3.5 & 3.6, add support for 3.9-3.11.

mu-editor · Jul 18, 2022 · e4bbb38 · e4bbb38
1 parent 046d78c
commit e4bbb38
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,8 +11,8 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-latest, macos-10.15, macos-latest, windows-2019, windows-latest]
-        python-version: ['3.5', '3.6', '3.7', '3.8']
+        os: [ubuntu-20.04, ubuntu-22.04, macos-10.15, macos-12, windows-2016, windows-2022]
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11-dev']
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: Test Py ${{ matrix.python-version }} - ${{ matrix.os }}
@@ -33,17 +33,21 @@ jobs:
           pip freeze
       - name: Prepare Ubuntu
         if: runner.os == 'Linux'
+        #sudo apt-get install -y libglu1 ffmpeg libsm6 libxext6 libgl1-mesa-glx libgl1 libglib2.0-0 libxkbcommon-x11-0 xvfb
+        #sudo apt-get install -y libgl1-mesa-glx libxdamage1 libegl1 libxkbcommon0 libopengl0 libopengl-dev libxkbcommon-dev libegl-dev xvfb
+        #sudo apt-get install -y libxcb-xinerama0 libegl1-mesa libegl1 libxkbcommon-x11-0 xvfb
+        # This is needed for PyQt6 not to crash saying it's missing libGL.so.1 and libglib-2.0.so.0
         run: |
-          sudo apt-get update
-          sudo apt-get install -y libxkbcommon-x11-0 xvfb
+          sudo apt update
+          sudo apt install -y libgl1 libglib2.0-0
       - name: Install Mu dependencies
         run: |
           pip install .[dev]
           pip list
         timeout-minutes: 10
       - name: Run tests
         if: runner.os == 'Linux'
-        run: xvfb-run make check
+        run: QT_QPA_PLATFORM=offscreen python make.py test -s --verbose
         timeout-minutes: 5
       - name: Run tests
         if: runner.os != 'Linux'
@@ -57,16 +61,16 @@ jobs:
       - uses: actions/checkout@v2
       - name: Set up QEMU
         id: qemu
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           image: tonistiigi/binfmt:latest
           platforms: 'linux/arm64,linux/arm/v7,linux/arm/v6'
       - name: Check Debian image info
-        uses: docker://multiarch/debian-debootstrap:armhf-buster
+        uses: docker://arm32v7/debian:bookworm
         with:
-          args: /bin/bash -c "uname -a && cat /etc/os-release"
+          args: bash -c "uname -a && cat /etc/os-release"
       - name: Install dependencies and run tests
-        uses: docker://multiarch/debian-debootstrap:armhf-buster
+        uses: docker://arm32v7/debian:bookworm
         with:
           args: >
             bash -c "
@@ -94,7 +98,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        docker-tag: ['stretch-2018-03-13', 'buster-2021-05-28', 'buster-legacy-2022-04-07']
+        docker-tag: ['buster-2021-05-28', 'buster-legacy-2022-04-07']
       fail-fast: false
     services:
       rpios:

diff --git a/setup.py b/setup.py
@@ -27,8 +27,7 @@
     #
     "PyQt6==6.3.1"
     + ';"arm" not in platform_machine and "aarch" not in platform_machine',
-    # Last version to support Python 3.6
-    "PyQt6-QScintilla==2.13.2"
+    "PyQt6-QScintilla==2.13.3"
     + ';"arm" not in platform_machine and "aarch" not in platform_machine',
     "PyQt6-Charts==6.3.1"
     + ';"arm" not in platform_machine and "aarch" not in platform_machine',
@@ -59,7 +58,7 @@
     "flake8 >= 3.8.3",
     # Clamp click max version to workaround incompatibility with black<22.1.0
     "click<=8.0.4",
-    "black>=19.10b0,<22.1.0;python_version>'3.5'",
+    "black>=19.10b0,<22.1.0",
     "appdirs>=1.4.3",
     "semver>=2.8.0",
     # virtualenv vendors pip, we need at least pip v19.3 to install some
@@ -129,7 +128,7 @@
         "mu.modes.api",
         "mu.wheels",
     ],
-    python_requires=">=3.5,<3.9",
+    python_requires=">=3.7,<3.12",
     install_requires=install_requires,
     extras_require=extras_require,
     package_data={"mu.wheels": ["*.whl", "*.zip"]},
@@ -148,10 +147,11 @@
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Education",
         "Topic :: Games/Entertainment",
         "Topic :: Software Development",