Skip to content

Commit 85ce97f

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

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-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
@@ -75,9 +75,6 @@ jobs:
7575
strategy:
7676
matrix:
7777
test_env: [
78-
# Cy2020
79-
'test-py37-PySide5.13',
80-
'test-py37-PyQt5.13',
8178
# Cy2021
8279
'test-py37-PySide5.15',
8380
'test-py37-PyQt5.15',

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Qt.py enables you to write software that runs on any of the 4 supported bindings
1515

1616
| Date | Version | Event
1717
|:---------|:----------|:----------
18-
| Jan 2025 | [2.0.0][] | Dropped support for Qt 4 and python versions older than 3.7
18+
| Jan 2025 | [2.1.0][] | Dropped support for Qt versions older than 5.15
19+
| Jan 2025 | [2.0.1][] | 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.
2122
| Sep 2020 | [1.3.0][] | Stability improvements and greater ability for `QtCompat.wrapInstance` to do its job
@@ -214,6 +215,7 @@ See the wiki for a breakdown of what members are common across the supported Qt
214215
- [Qt.py<1.4](https://github.com/mottosso/Qt.py/wiki/Membership-between-Qt4,Qt5): PySide2, PyQt5, PySide, PyQt4
215216
- [Qt.py=\=1.4.\*](https://github.com/mottosso/Qt.py/wiki/Membership-between-Qt4,Qt5,Qt6): PySide6, PyQt6, PySide2, PyQt5, PySide, PyQt4
216217
- [Qt.py=\=2.0.\*](https://github.com/mottosso/Qt.py/wiki/Membership-between-Qt5.13,Qt6): PySide6, PyQt6, PySide2, PyQt5. (Minimum Qt version 5.13)
218+
- [Qt.py=\=2.1.\*](https://github.com/mottosso/Qt.py/wiki/Membership-between-Qt5,Qt6): PySide6, PyQt6, PySide2, PyQt5. (Minimum Qt version 5.15)
217219

218220
<br>
219221

src/Qt.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
"QBuffer",
9595
"QByteArray",
9696
"QByteArrayMatcher",
97+
"QCalendar",
9798
"QCborError",
9899
"QCborKnownTags",
99100
"QCborSimpleType",
@@ -110,6 +111,7 @@
110111
"QDataStream",
111112
"QDate",
112113
"QDateTime",
114+
"QDeadlineTimer",
113115
"QDir",
114116
"QDirIterator",
115117
"QDynamicPropertyChangeEvent",
@@ -168,6 +170,7 @@
168170
"QReadWriteLock",
169171
"QRect",
170172
"QRectF",
173+
"QRecursiveMutex",
171174
"QRegularExpression",
172175
"QRegularExpressionMatch",
173176
"QRegularExpressionMatchIterator",
@@ -248,6 +251,8 @@
248251
"QClipboard",
249252
"QCloseEvent",
250253
"QColor",
254+
"QColorConstants",
255+
"QColorSpace",
251256
"QConicalGradient",
252257
"QContextMenuEvent",
253258
"QCursor",
@@ -329,6 +334,7 @@
329334
"QRasterWindow",
330335
"QRawFont",
331336
"QRegion",
337+
"QRegularExpressionValidator",
332338
"QResizeEvent",
333339
"QScreen",
334340
"QScrollEvent",
@@ -400,8 +406,10 @@
400406
"QHelpEngineCore",
401407
"QHelpFilterData",
402408
"QHelpFilterEngine",
409+
"QHelpFilterSettingsWidget",
403410
"QHelpIndexModel",
404411
"QHelpIndexWidget",
412+
"QHelpLink",
405413
"QHelpSearchEngine",
406414
"QHelpSearchQuery",
407415
"QHelpSearchQueryWidget",
@@ -562,6 +570,7 @@
562570
"QRemoteObjectRegistry",
563571
"QRemoteObjectRegistryHost",
564572
"QRemoteObjectReplica",
573+
"QRemoteObjectSourceLocationInfo",
565574
],
566575
"QtSensors": [
567576
"QAccelerometer",
@@ -617,6 +626,7 @@
617626
"QTiltSensor",
618627
"qoutputrange",
619628
],
629+
"QtSerialPort": ["QSerialPort", "QSerialPortInfo"],
620630
"QtSql": [
621631
"QSql",
622632
"QSqlDatabase",
@@ -636,6 +646,7 @@
636646
],
637647
"QtSvg": ["QSvgGenerator", "QSvgRenderer"],
638648
"QtTest": ["QTest"],
649+
"QtTextToSpeech": ["QTextToSpeech", "QVoice"],
639650
"QtWebChannel": ["QWebChannel", "QWebChannelAbstractTransport"],
640651
"QtWebSockets": [
641652
"QMaskGenerator",
@@ -857,10 +868,10 @@
857868
858869
"""
859870
_common_members_sources = [
860-
"PyQt5-5.13.2_py-3.7.17",
861871
"PyQt5-5.15.11_py-3.9.25",
872+
"PyQt5-5.15.9_py-3.7.17",
862873
"PyQt6-6.7.1_py-3.11.14",
863-
"PySide2-5.13.2_py-3.7.17",
874+
"PySide2-5.15.2.1_py-3.7.17",
864875
"PySide2-5.15.2.1_py-3.9.25",
865876
"PySide6-6.5.3_py-3.11.14",
866877
]

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)