Skip to content

Commit 9d19b9b

Browse files
committed
Remove Cy2020 support
This adds several common members that had to be excluded when supporting Qt 5.13.
1 parent 1b9bcab commit 9d19b9b

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

.github/workflows/run-tox.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
# membership-end combines binding/py data into common membership report
3131
run: |
3232
which tox
33-
tox -e membership-py37-PySide5.13,membership-py37-PyQt5.13,membership-py39-PySide5.15,membership-py39-PyQt5.15,membership-py311-PySide6.5,membership-py311-PyQt6.7,membership-end
33+
tox -e membership-py37-PySide5.15,membership-py37-PyQt5.15,membership-py39-PySide5.15,membership-py39-PyQt5.15,membership-py311-PySide6.5,membership-py311-PyQt6.7,membership-end
3434
ls -lha .members
3535
3636
- name: Upload membership report
@@ -47,9 +47,6 @@ jobs:
4747
strategy:
4848
matrix:
4949
test_env: [
50-
# Cy2020
51-
'test-py37-PySide5.13',
52-
'test-py37-PyQt5.13',
5350
# Cy2021
5451
'test-py37-PySide5.15',
5552
'test-py37-PyQt5.15',

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Qt.py enables you to write software that runs on any of the 6 supported bindings
1515

1616
| Date | Version | Event
1717
|:---------|:----------|:----------
18+
| Jan 2025 | [2.1.0][] | Dropped support for Qt versions older than 5.15
1819
| Jan 2025 | [2.0.0][] | Dropped support for Qt 4 and python versions older than 3.7
1920
| May 2024 | [1.4.1][] | Added support for Qt 6
2021
| Jan 2024 | [1.3.9][] | Run CI on Github Actions, instead of Travis CI.

src/Qt.py

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
"QBuffer",
9393
"QByteArray",
9494
"QByteArrayMatcher",
95+
"QCalendar",
9596
"QCborError",
9697
"QCborKnownTags",
9798
"QCborSimpleType",
@@ -108,6 +109,7 @@
108109
"QDataStream",
109110
"QDate",
110111
"QDateTime",
112+
"QDeadlineTimer",
111113
"QDir",
112114
"QDirIterator",
113115
"QDynamicPropertyChangeEvent",
@@ -166,6 +168,7 @@
166168
"QReadWriteLock",
167169
"QRect",
168170
"QRectF",
171+
"QRecursiveMutex",
169172
"QRegularExpression",
170173
"QRegularExpressionMatch",
171174
"QRegularExpressionMatchIterator",
@@ -246,6 +249,8 @@
246249
"QClipboard",
247250
"QCloseEvent",
248251
"QColor",
252+
"QColorConstants",
253+
"QColorSpace",
249254
"QConicalGradient",
250255
"QContextMenuEvent",
251256
"QCursor",
@@ -327,6 +332,7 @@
327332
"QRasterWindow",
328333
"QRawFont",
329334
"QRegion",
335+
"QRegularExpressionValidator",
330336
"QResizeEvent",
331337
"QScreen",
332338
"QScrollEvent",
@@ -398,8 +404,10 @@
398404
"QHelpEngineCore",
399405
"QHelpFilterData",
400406
"QHelpFilterEngine",
407+
"QHelpFilterSettingsWidget",
401408
"QHelpIndexModel",
402409
"QHelpIndexWidget",
410+
"QHelpLink",
403411
"QHelpSearchEngine",
404412
"QHelpSearchQuery",
405413
"QHelpSearchQueryWidget",
@@ -564,7 +572,8 @@
564572
"QRemoteObjectNode",
565573
"QRemoteObjectRegistry",
566574
"QRemoteObjectRegistryHost",
567-
"QRemoteObjectReplica"
575+
"QRemoteObjectReplica",
576+
"QRemoteObjectSourceLocationInfo"
568577
],
569578
"QtSensors": [
570579
"QAccelerometer",
@@ -620,6 +629,10 @@
620629
"QTiltSensor",
621630
"qoutputrange"
622631
],
632+
"QtSerialPort": [
633+
"QSerialPort",
634+
"QSerialPortInfo"
635+
],
623636
"QtSql": [
624637
"QSql",
625638
"QSqlDatabase",
@@ -644,6 +657,10 @@
644657
"QtTest": [
645658
"QTest"
646659
],
660+
"QtTextToSpeech": [
661+
"QTextToSpeech",
662+
"QVoice"
663+
],
647664
"QtWebChannel": [
648665
"QWebChannel",
649666
"QWebChannelAbstractTransport"
@@ -868,10 +885,8 @@
868885
869886
"""
870887
_common_members_sources = [
871-
"PyQt5-5.13.2_py-3.7.9",
872888
"PyQt5-5.15.11_py-3.9.13",
873889
"PyQt6-6.7.1_py-3.11.9",
874-
"PySide2-5.13.2_py-3.7.9",
875890
"PySide2-5.15.2.1_py-3.9.13",
876891
"PySide6-6.5.3_py-3.11.9"
877892
]

tox.ini

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ envlist =
99
# VFX Reference Platform specific builds(Officially supported by Qt.py)
1010
# Note: Github action/tox testing is limited to just 1 reference python
1111
# version per Qt binding to simplify the generated markdown tables.
12-
# Cy2020
13-
membership-py37-{PySide,PyQt}5.13
12+
# Cy2021
13+
membership-py37-{PySide,PyQt}5.15
1414
# Cy2022
1515
membership-py39-{PySide,PyQt}5.15
1616
# Cy2023
@@ -33,8 +33,6 @@ envlist =
3333
# Pre-Generate files for other tests to work around parallelization issues
3434
test-begin
3535
# VFX Reference Platform specific builds(Officially supported by Qt.py)
36-
# Cy2020
37-
test-py37-{PySide,PyQt}5.13-{impl,caveats,examples}
3836
# Cy2021
3937
test-py37-{PySide,PyQt}5.15-{impl,caveats,examples}
4038
# Cy2022

0 commit comments

Comments
 (0)