Merge branch 'master' into py316-deprecate

Author: johnzhou721

.github/workflows/main.yml

@@ -19,19 +19,34 @@ jobs:
     runs-on: ${{ matrix.image }}
     strategy:
       matrix:
-        os: [Ubuntu, Windows, MacOS]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
+        os: [ubuntu, windows, macos-x86_64, macos-arm64]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         qt-version: ["pyside2", "pyside6", "pyqt5", "pyqt6"]
         include:
-          - os: Ubuntu
+          - os: ubuntu
             image: ubuntu-24.04
-          - os: Windows
+          - os: windows
             image: windows-2022
-          - os: MacOS
+          - os: macos-x86_64
+            image: macos-13
+          - os: macos-arm64
             image: macos-14
-          - os: MacOS
+        exclude:
+          # pyside2 does not publish arm64 packages
+          - os: macos-arm64
             qt-version: pyside2
-            image: macos-13
+          # pyside2 requires python <3.11
+          - python-version: "3.11"
+            qt-version: pyside2
+          - python-version: "3.12"
+            qt-version: pyside2
+          - python-version: "3.13"
+            qt-version: pyside2
+          # pyside6 and pyqt6 require python >=3.9
+          - python-version: "3.8"
+            qt-version: pyside6
+          - python-version: "3.8"
+            qt-version: pyqt6
       fail-fast: false
     defaults:
       run:
@@ -55,22 +70,22 @@ jobs:
           curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.4 python - -y
 
       - name: Update Path
-        if: ${{ matrix.os != 'Windows' }}
+        if: ${{ matrix.os != 'windows' }}
         run: echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Update Path for Windows
-        if: ${{ matrix.os == 'Windows' }}
+        if: ${{ matrix.os == 'windows' }}
         run: echo "$APPDATA\Python\Scripts" >> $GITHUB_PATH
 
       - name: Enable long paths on Windows
-        if: ${{ matrix.os == 'Windows' }}
+        if: ${{ matrix.os == 'windows' }}
         run: git config --system core.longpaths true
 
       - name: Configure poetry
         run: poetry config virtualenvs.in-project true
 
       - name: Setup cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache
         with:
           path: .venv
@@ -79,7 +94,7 @@ jobs:
       - name: Valdate cache
         if: steps.cache.outputs.cache-hit == 'true'
         run: |
-          # `timeout` is not available on macOS, so we define a custom function.
+          # `timeout` is not available on macos, so we define a custom function.
           [ "$(command -v timeout)" ] || function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
 
           # Using `timeout` is a safeguard against the Poetry command hanging for some reason.
@@ -95,10 +110,10 @@ jobs:
       #   run: poetry run mypy
 
       - name: Install Qt
-        run: poetry run pip install ${{ matrix.qt-version }}
+        run: poetry run pip install --ignore-installed ${{ matrix.qt-version }}
 
       - name: Install libxcb dependencies
-        if: ${{ matrix.os == 'Ubuntu' }}
+        if: ${{ matrix.os == 'ubuntu' }}
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |

README.md

@@ -1,6 +1,6 @@
 # qasync
 
-[![Maintenance](https://img.shields.io/maintenance/yes/2023)](https://pypi.org/project/qasync)
+[![Maintenance](https://img.shields.io/maintenance/yes/2025)](https://pypi.org/project/qasync)
 [![PyPI](https://img.shields.io/pypi/v/qasync)](https://pypi.org/project/qasync)
 [![PyPI - License](https://img.shields.io/pypi/l/qasync)](/LICENSE)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/qasync)](https://pypi.org/project/qasync)
@@ -13,16 +13,18 @@
 
 With `qasync`, you can use `asyncio` functionalities directly inside Qt app's event loop, in the main thread. Using async functions for Python tasks can be much easier and cleaner than using `threading.Thread` or `QThread`.
 
-If you need some CPU-intensive tasks to be executed in parallel, `qasync` also got that covered, providing `QEventLoop.run_in_executor` which is functionally identical to that of `asyncio`.
+If you need some CPU-intensive tasks to be executed in parallel, `qasync` also got that covered, providing `QEventLoop.run_in_executor` which is functionally identical to that of `asyncio`. By default `QThreadExecutor` is used, but any class implementing the `concurrent.futures.Executor` interface will do the job.
 
 ### Basic Example
 
 ```python
-import sys
 import asyncio
+import sys
+
+from PySide6.QtWidgets import QVBoxLayout, QWidget
+
+from qasync import QApplication, QEventLoop
 
-from qasync import QEventLoop, QApplication
-from PySide6.QtWidgets import QWidget, QVBoxLayout
 
 class MainWindow(QWidget):
     def __init__(self):
@@ -67,7 +69,7 @@ More detailed examples can be found [here](https://github.com/CabbageDevelopment
 
 ## Requirements
 
-- Python >= 3.8
+- Python >=3.8, <3.14
 - PyQt5/PyQt6 or PySide2/PySide6
 
 `qasync` is tested on Ubuntu, Windows and MacOS.

examples/qml_httpx/app.py

@@ -2,9 +2,9 @@
 import asyncio
 from pathlib import Path
 
-from qasync import QEventLoop, QApplication
 from PySide6.QtCore import QUrl
 from PySide6.QtQml import QQmlApplicationEngine, qmlRegisterType
+from qasync import QEventLoop, QApplication
 
 from service import ExampleService
 

examples/qml_httpx/service.py

@@ -1,7 +1,7 @@
 import httpx
 
-from qasync import asyncSlot
 from PySide6.QtCore import QObject, Signal, Property, Slot
+from qasync import asyncSlot
 
 
 class ExampleService(QObject):