Skip to content

Commit 89fe6c8

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

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
@@ -98,6 +98,7 @@
9898
"QBuffer",
9999
"QByteArray",
100100
"QByteArrayMatcher",
101+
"QCalendar",
101102
"QCborError",
102103
"QCborKnownTags",
103104
"QCborSimpleType",
@@ -114,6 +115,7 @@
114115
"QDataStream",
115116
"QDate",
116117
"QDateTime",
118+
"QDeadlineTimer",
117119
"QDir",
118120
"QDirIterator",
119121
"QDynamicPropertyChangeEvent",
@@ -172,6 +174,7 @@
172174
"QReadWriteLock",
173175
"QRect",
174176
"QRectF",
177+
"QRecursiveMutex",
175178
"QRegularExpression",
176179
"QRegularExpressionMatch",
177180
"QRegularExpressionMatchIterator",
@@ -252,6 +255,8 @@
252255
"QClipboard",
253256
"QCloseEvent",
254257
"QColor",
258+
"QColorConstants",
259+
"QColorSpace",
255260
"QConicalGradient",
256261
"QContextMenuEvent",
257262
"QCursor",
@@ -333,6 +338,7 @@
333338
"QRasterWindow",
334339
"QRawFont",
335340
"QRegion",
341+
"QRegularExpressionValidator",
336342
"QResizeEvent",
337343
"QScreen",
338344
"QScrollEvent",
@@ -404,8 +410,10 @@
404410
"QHelpEngineCore",
405411
"QHelpFilterData",
406412
"QHelpFilterEngine",
413+
"QHelpFilterSettingsWidget",
407414
"QHelpIndexModel",
408415
"QHelpIndexWidget",
416+
"QHelpLink",
409417
"QHelpSearchEngine",
410418
"QHelpSearchQuery",
411419
"QHelpSearchQueryWidget",
@@ -570,7 +578,8 @@
570578
"QRemoteObjectNode",
571579
"QRemoteObjectRegistry",
572580
"QRemoteObjectRegistryHost",
573-
"QRemoteObjectReplica"
581+
"QRemoteObjectReplica",
582+
"QRemoteObjectSourceLocationInfo"
574583
],
575584
"QtSensors": [
576585
"QAccelerometer",
@@ -626,6 +635,10 @@
626635
"QTiltSensor",
627636
"qoutputrange"
628637
],
638+
"QtSerialPort": [
639+
"QSerialPort",
640+
"QSerialPortInfo"
641+
],
629642
"QtSql": [
630643
"QSql",
631644
"QSqlDatabase",
@@ -650,6 +663,10 @@
650663
"QtTest": [
651664
"QTest"
652665
],
666+
"QtTextToSpeech": [
667+
"QTextToSpeech",
668+
"QVoice"
669+
],
653670
"QtWebChannel": [
654671
"QWebChannel",
655672
"QWebChannelAbstractTransport"
@@ -874,10 +891,8 @@
874891
875892
"""
876893
_common_members_sources = [
877-
"PyQt5-5.13.2_py-3.7.9",
878894
"PyQt5-5.15.11_py-3.9.13",
879895
"PyQt6-6.7.1_py-3.11.9",
880-
"PySide2-5.13.2_py-3.7.9",
881896
"PySide2-5.15.2.1_py-3.9.13",
882897
"PySide6-6.5.3_py-3.11.9"
883898
]

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)