Skip to content

Commit 89e857d

Browse files
authored
Merge pull request #136 from CabbageDevelopment/ci-python-3.13
Add CI for python 3.13
2 parents bf97d49 + ce5e775 commit 89e857d

8 files changed

Lines changed: 37 additions & 36 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
os: [ubuntu, windows, macos-x86_64, macos-arm64]
23-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
23+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
2424
qt-version: ["pyside2", "pyside6", "pyqt5", "pyqt6"]
2525
include:
2626
- os: ubuntu
@@ -40,6 +40,8 @@ jobs:
4040
qt-version: pyside2
4141
- python-version: "3.12"
4242
qt-version: pyside2
43+
- python-version: "3.13"
44+
qt-version: pyside2
4345
# pyside6 and pyqt6 require python >=3.9
4446
- python-version: "3.8"
4547
qt-version: pyside6

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ More detailed examples can be found [here](https://github.com/CabbageDevelopment
6969

7070
## Requirements
7171

72-
- Python >=3.8, <3.13
72+
- Python >=3.8, <3.14
7373
- PyQt5/PyQt6 or PySide2/PySide6
7474

7575
`qasync` is tested on Ubuntu, Windows and MacOS.

poetry.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ classifiers = [
2929
]
3030

3131
[tool.poetry.dependencies]
32-
python = ">=3.8, <3.13"
32+
python = ">=3.8, <3.14"
3333

3434
[tool.poetry.group.dev.dependencies]
3535
pre-commit = "^2.21"

qasync/__init__.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
BSD License
99
"""
1010

11-
__author__ = (
12-
"Sam McCormack",
13-
"Gerard Marull-Paretas <gerard@teslabs.com>, "
14-
"Mark Harviston <mark.harviston@gmail.com>, "
15-
"Arve Knudsen <arve.knudsen@gmail.com>",
16-
)
1711
__all__ = ["QEventLoop", "QThreadExecutor", "asyncSlot", "asyncClose"]
1812

1913
import asyncio
@@ -39,11 +33,10 @@
3933
env_to_mod_map = {
4034
"pyqt5": "PyQt5",
4135
"pyqt6": "PyQt6",
42-
"pyqt": "PyQt4",
43-
"pyqt4": "PyQt4",
36+
"pyqt": "PyQt6",
4437
"pyside6": "PySide6",
4538
"pyside2": "PySide2",
46-
"pyside": "PySide",
39+
"pyside": "PySide6",
4740
}
4841
if qtapi_env in env_to_mod_map:
4942
QtModuleName = env_to_mod_map[qtapi_env]

qasync/_common.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
# © 2018 Gerard Marull-Paretas <gerard@teslabs.com>
2-
# © 2014 Mark Harviston <mark.harviston@gmail.com>
3-
# © 2014 Arve Knudsen <arve.knudsen@gmail.com>
4-
# BSD License
1+
"""
2+
Mostly irrelevant, but useful utilities common to UNIX and Windows.
3+
4+
Copyright (c) 2018 Gerard Marull-Paretas <gerard@teslabs.com>
5+
Copyright (c) 2014 Mark Harviston <mark.harviston@gmail.com>
6+
Copyright (c) 2014 Arve Knudsen <arve.knudsen@gmail.com>
7+
8+
BSD License
9+
"""
510

6-
"""Mostly irrelevant, but useful utilities common to UNIX and Windows."""
711
import logging
812

913

qasync/_unix.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
# © 2018 Gerard Marull-Paretas <gerard@teslabs.com>
2-
# © 2014 Mark Harviston <mark.harviston@gmail.com>
3-
# © 2014 Arve Knudsen <arve.knudsen@gmail.com>
4-
# BSD License
1+
"""
2+
UNIX specific qasync functionality.
53
6-
"""UNIX specific Quamash functionality."""
4+
Copyright (c) 2018 Gerard Marull-Paretas <gerard@teslabs.com>
5+
Copyright (c) 2014 Mark Harviston <mark.harviston@gmail.com>
6+
Copyright (c) 2014 Arve Knudsen <arve.knudsen@gmail.com>
7+
8+
BSD License
9+
"""
710

811
import asyncio
9-
import selectors
1012
import collections
13+
import selectors
1114

12-
from . import QtCore, with_logger, _fileno
13-
15+
from . import QtCore, _fileno, with_logger
1416

1517
EVENT_READ = 1 << 0
1618
EVENT_WRITE = 1 << 1
1719

1820

1921
class _SelectorMapping(collections.abc.Mapping):
20-
2122
"""Mapping of file objects to selector keys."""
2223

2324
def __init__(self, selector):

qasync/_windows.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
# © 2018 Gerard Marull-Paretas <gerard@teslabs.com>
2-
# © 2014 Mark Harviston <mark.harviston@gmail.com>
3-
# © 2014 Arve Knudsen <arve.knudsen@gmail.com>
4-
# BSD License
1+
"""
2+
Windows specific qasync functionality.
53
6-
"""Windows specific Quamash functionality."""
4+
Copyright (c) 2018 Gerard Marull-Paretas <gerard@teslabs.com>
5+
Copyright (c) 2014 Mark Harviston <mark.harviston@gmail.com>
6+
Copyright (c) 2014 Arve Knudsen <arve.knudsen@gmail.com>
7+
8+
BSD License
9+
"""
710

811
import asyncio
912
import sys
1013

1114
try:
15+
import _overlapped
1216
import _winapi
1317
from asyncio import windows_events
14-
import _overlapped
1518
except ImportError: # noqa
1619
pass # w/o guarding this import py.test can't gather doctests on platforms w/o _winapi
1720

@@ -24,7 +27,6 @@
2427

2528

2629
class _ProactorEventLoop(asyncio.ProactorEventLoop):
27-
2830
"""Proactor based event loop."""
2931

3032
def __init__(self):
@@ -203,7 +205,6 @@ def run(self):
203205

204206
@with_logger
205207
class _EventPoller:
206-
207208
"""Polling of events in separate thread."""
208209

209210
def __init__(self, sig_events):

0 commit comments

Comments
 (0)