Remove Cy2020 support

This adds several common members that had to be excluded when supporting Qt 5.13.
Remove py 3.7 specific pathlib workarounds.

Author: MHendricks

.github/workflows/run-tox.yml

@@ -30,7 +30,7 @@ jobs:
         # membership-end combines binding/py data into common membership report
         run: |
           which tox
-          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
+          tox -e membership-py39-PySide5.15,membership-py39-PyQt5.15,membership-py311-PySide6.5,membership-py311-PyQt6.7,membership-end
           ls -lha .members
 
       - name: Upload membership report
@@ -47,9 +47,6 @@ jobs:
     strategy:
       matrix:
         test_env: [
-          # Cy2020
-          'test-py37-PySide5.13',
-          'test-py37-PyQt5.13',
           # Cy2021
           'test-py39-PySide5.15',
           'test-py39-PyQt5.15',

src/Qt.py

@@ -98,6 +98,7 @@
         "QBuffer",
         "QByteArray",
         "QByteArrayMatcher",
+        "QCalendar",
         "QCborError",
         "QCborKnownTags",
         "QCborSimpleType",
@@ -114,6 +115,7 @@
         "QDataStream",
         "QDate",
         "QDateTime",
+        "QDeadlineTimer",
         "QDir",
         "QDirIterator",
         "QDynamicPropertyChangeEvent",
@@ -172,6 +174,7 @@
         "QReadWriteLock",
         "QRect",
         "QRectF",
+        "QRecursiveMutex",
         "QRegularExpression",
         "QRegularExpressionMatch",
         "QRegularExpressionMatchIterator",
@@ -252,6 +255,8 @@
         "QClipboard",
         "QCloseEvent",
         "QColor",
+        "QColorConstants",
+        "QColorSpace",
         "QConicalGradient",
         "QContextMenuEvent",
         "QCursor",
@@ -333,6 +338,7 @@
         "QRasterWindow",
         "QRawFont",
         "QRegion",
+        "QRegularExpressionValidator",
         "QResizeEvent",
         "QScreen",
         "QScrollEvent",
@@ -404,8 +410,10 @@
         "QHelpEngineCore",
         "QHelpFilterData",
         "QHelpFilterEngine",
+        "QHelpFilterSettingsWidget",
         "QHelpIndexModel",
         "QHelpIndexWidget",
+        "QHelpLink",
         "QHelpSearchEngine",
         "QHelpSearchQuery",
         "QHelpSearchQueryWidget",
@@ -570,7 +578,8 @@
         "QRemoteObjectNode",
         "QRemoteObjectRegistry",
         "QRemoteObjectRegistryHost",
-        "QRemoteObjectReplica"
+        "QRemoteObjectReplica",
+        "QRemoteObjectSourceLocationInfo"
     ],
     "QtSensors": [
         "QAccelerometer",
@@ -626,6 +635,10 @@
         "QTiltSensor",
         "qoutputrange"
     ],
+    "QtSerialPort": [
+        "QSerialPort",
+        "QSerialPortInfo"
+    ],
     "QtSql": [
         "QSql",
         "QSqlDatabase",
@@ -650,6 +663,10 @@
     "QtTest": [
         "QTest"
     ],
+    "QtTextToSpeech": [
+        "QTextToSpeech",
+        "QVoice"
+    ],
     "QtWebChannel": [
         "QWebChannel",
         "QWebChannelAbstractTransport"
@@ -874,10 +891,8 @@
 
 """
 _common_members_sources = [
-    "PyQt5-5.13.2_py-3.7.9",
     "PyQt5-5.15.11_py-3.9.13",
     "PyQt6-6.7.1_py-3.11.9",
-    "PySide2-5.13.2_py-3.7.9",
     "PySide2-5.15.2.1_py-3.9.13",
     "PySide6-6.5.3_py-3.11.9"
 ]

tests.py

@@ -405,24 +405,6 @@ def get_enum(cls, namespace, enum):
     return getattr(cls, enum)
 
 
-def subprocess_run(cmd, **kwargs):
-    """Work around python 3.7 not supporting passing pathlib objects to cmd.
-    TODO: Remove once we drop python 3.7 support.
-    """
-    if sys.version_info < (3, 8) and not isinstance(cmd, str):
-        cmd = [str(c) for c in cmd]
-    return subprocess.run(cmd, **kwargs)
-
-
-def subprocess_check_output(cmd, **kwargs):
-    """Work around python 3.7 not supporting passing pathlib objects to cmd.
-    TODO: Remove once we drop python 3.7 support.
-    """
-    if sys.version_info < (3, 8) and not isinstance(cmd, str):
-        cmd = [str(c) for c in cmd]
-    return subprocess.check_output(cmd, **kwargs)
-
-
 @contextlib.contextmanager
 def ignoreQtMessageHandler(msgs):
     """A context that ignores specific qMessages for all bindings
@@ -1478,14 +1460,14 @@ def test_convert_enum():
             fle.write(enum_file_2)
 
         cmd = [sys.executable, code_path, old_code_dir]
-        output = subprocess_check_output(cmd, cwd=self.tempdir, universal_newlines=True)
+        output = subprocess.check_output(cmd, cwd=self.tempdir, universal_newlines=True)
 
         assert enum_check in output
 
         # Check using the "--check" command outputs the same text but uses
         # the return code for the number of enums being changed.
         try:
-            output = subprocess_check_output(
+            output = subprocess.check_output(
                 cmd + ["--check"], cwd=self.tempdir, universal_newlines=True
             )
         except subprocess.CalledProcessError as error:
@@ -1496,12 +1478,12 @@ def test_convert_enum():
 
         # Test actually updating the files.
         cmd.append("--write")
-        output = subprocess_check_output(cmd, cwd=self.tempdir, universal_newlines=True)
+        output = subprocess.check_output(cmd, cwd=self.tempdir, universal_newlines=True)
         assert enum_check in output
 
         # "--check" is respected in --write mode
         try:
-            output = subprocess_check_output(
+            output = subprocess.check_output(
                 cmd + ["--check"], cwd=self.tempdir, universal_newlines=True
             )
         except subprocess.CalledProcessError as error:
@@ -1522,7 +1504,7 @@ def test_convert_enum():
             assert fle.read() == check
 
         # Check using `--partial`
-        output = subprocess_check_output(
+        output = subprocess.check_output(
             cmd + ["--partial", "-v"], cwd=self.tempdir, universal_newlines=True
         )
         check = textwrap.dedent(
@@ -1540,7 +1522,7 @@ def test_convert_enum_map():
         """Test enum map generation for conversion from short to long enums"""
         code_path = REPO_ROOT / "src" / "Qt_convert_enum.py"
         cmd = [sys.executable, code_path, "--show", "map"]
-        proc = subprocess_run(
+        proc = subprocess.run(
             cmd,
             stdout=subprocess.PIPE,
             check=True,
@@ -1561,7 +1543,7 @@ def test_convert_enum_modules():
         """Test enum map generation modules data structure"""
         code_path = REPO_ROOT / "src" / "Qt_convert_enum.py"
         cmd = [sys.executable, code_path, "--show", "modules"]
-        proc = subprocess_run(
+        proc = subprocess.run(
             cmd,
             stdout=subprocess.PIPE,
             check=True,

tox.ini

@@ -9,8 +9,6 @@ envlist =
     # VFX Reference Platform specific builds(Officially supported by Qt.py)
     # Note: Github action/tox testing is limited to just 1 reference python
     # version per Qt binding to simplify the generated markdown tables.
-    # Cy2020
-    membership-py37-{PySide,PyQt}5.13
     # Cy2022
     membership-py39-{PySide,PyQt}5.15
     # Cy2023
@@ -33,8 +31,6 @@ envlist =
     # Pre-Generate files for other tests to work around parallelization issues
     test-begin
     # VFX Reference Platform specific builds(Officially supported by Qt.py)
-    # Cy2020
-    test-py37-{PySide,PyQt}5.13-{impl,caveats,examples}
     # Cy2021
     test-py39-{PySide,PyQt}5.15-{impl,caveats,examples}
     # Cy2022