Merge branch 'master' into add-more-tests

Author: bluebird75

.github/workflows/ci.yml

@@ -14,6 +14,10 @@ on:
     # relative to other daily builds in any given organization.
     - cron: '14 6 * * *'
 
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.sha || '' }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: ${{ matrix.os.name }} ${{ matrix.python.name }}
@@ -32,9 +36,6 @@ jobs:
             runs-on: windows-latest
             tox: windows
         python:
-          - name: CPython 3.6
-            tox: py36
-            action: 3.6
           - name: CPython 3.7
             tox: py37
             action: 3.7
@@ -48,9 +49,9 @@ jobs:
             tox: py310
             action: '3.10'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up ${{ matrix.python.name }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '${{ matrix.python.action }}.0-alpha - ${{ matrix.python.action }}.X'
           architecture: x64

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## To be released
+### Added
+* [#192](https://github.com./python-qt-tools/PyQt5-stubs/pull/192) Add missing platform specific stubs:
+  * Windows specific: QAxContainer.pyi QtWinExtras.pyi QtCore.QWinEventNotifier
+  * MacOs X specific: QtMacExtras.pyi QtWidgets.QMacCocoaViewContainer
 * [#195](https://github.com./python-qt-tools/PyQt5-stubs/pull/195) Add more tests based on the historical PR and issues:
   * check that QTest methods are static
   * check all pyqtSlot() usage
@@ -15,12 +19,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   * check signal connect() call returns a QMetaObject.Connection
   * check argument for disconnect() is optional
   * check QCoreApplication.instance() may return None
-* [#192](https://github.com./python-qt-tools/PyQt5-stubs/pull/192) Add missing platform specific stubs:
-  * Windows specific: QAxContainer.pyi QtWinExtras.pyi QtCore.QWinEventNotifier
-  * MacOs X specific: QtMacExtras.pyi QtWidgets.QMacCocoaViewContainer
 
 
-### Added
+### Changed
+* [#198](https://github.com./python-qt-tools/PyQt5-stubs/pull/198) Corrected `QTableWidget.cellWidget()` to return an an optional `QWidget` instead of a list of `QWidgets`.
+* [#210](https://github.com./python-qt-tools/PyQt5-stubs/pull/210) Correct `QLineEdit.setValidator()` to accept `None` for removing the validator.
+
 ## 5.15.6.0
 
 ### Added

PyQt5-stubs/QtCore.pyi

@@ -55,11 +55,18 @@ class pyqtSignal:
 
     def __init__(self, *types: typing.Any, name: str = ...) -> None: ...
 
-    @typing.overload
-    def __get__(self, instance: None, owner: typing.Type["QObject"]) -> "pyqtSignal": ...
+    if sys.version_info >= (3, 10):
+        @typing.overload
+        def __get__(self, instance: None, owner: typing.Optional[typing.Type["QObject"]] = ...) -> "pyqtSignal": ...
 
-    @typing.overload
-    def __get__(self, instance: "QObject", owner: typing.Type["QObject"]) -> pyqtBoundSignal: ...
+        @typing.overload
+        def __get__(self, instance: "QObject", owner: typing.Optional[typing.Type["QObject"]] = ...) -> pyqtBoundSignal: ...
+    else:
+        @typing.overload
+        def __get__(self, instance: None, owner: typing.Type["QObject"]) -> "pyqtSignal": ...
+
+        @typing.overload
+        def __get__(self, instance: "QObject", owner: typing.Type["QObject"]) -> pyqtBoundSignal: ...
 
 
 # Convenient type aliases.

PyQt5-stubs/QtWidgets.pyi

@@ -7177,7 +7177,7 @@ class QLineEdit(QWidget):
     def minimumSizeHint(self) -> QtCore.QSize: ...
     def sizeHint(self) -> QtCore.QSize: ...
     def validator(self) -> QtGui.QValidator: ...
-    def setValidator(self, a0: QtGui.QValidator) -> None: ...
+    def setValidator(self, a0: typing.Optional[QtGui.QValidator]) -> None: ...
     def setReadOnly(self, a0: bool) -> None: ...
     def isReadOnly(self) -> bool: ...
     def setEchoMode(self, a0: 'QLineEdit.EchoMode') -> None: ...
@@ -10643,7 +10643,7 @@ class QTableWidget(QTableView):
     def setRangeSelected(self, range: QTableWidgetSelectionRange, select: bool) -> None: ...
     def removeCellWidget(self, arow: int, acolumn: int) -> None: ...
     def setCellWidget(self, row: int, column: int, widget: QWidget) -> None: ...
-    def cellWidget(self, row: int, column: int) -> typing.List[QWidget]: ...
+    def cellWidget(self, row: int, column: int) -> typing.Optional[QWidget]: ...
     def closePersistentEditor(self, item: typing.Optional[QTableWidgetItem]) -> None: ...  # type: ignore[override]
     def openPersistentEditor(self, item: typing.Optional[QTableWidgetItem]) -> None: ...  # type: ignore[override]
     def editItem(self, item: typing.Optional[QTableWidgetItem]) -> None: ...

setup.py

@@ -47,7 +47,7 @@ def find_version(*file_paths):
     long_description=long_description,
     long_description_content_type="text/markdown",
     version=find_version('PyQt5-stubs', '__init__.pyi'),
-    python_requires=">= 3.5",
+    python_requires=">= 3.7",
     package_data={"PyQt5-stubs": ['*.pyi']},
     packages=["PyQt5-stubs"],
     extras_require={

tests/qlineedit.py

@@ -4,3 +4,4 @@
 # test that QLineEdit.setText() accepts None as parameter
 edit = QLineEdit()
 edit.setText(None)
+edit.setValidator(None)

tests/qtablewidget.py

@@ -0,0 +1,5 @@
+from typing import Optional
+from PyQt5.QtWidgets import QTableWidget, QWidget
+
+table = QTableWidget()
+cell: Optional[QWidget] = table.cellWidget(0, 0)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{6,7,8,9,10}-{windows,linux}
+envlist = py3{7,8,9,10}-{windows,linux}
 
 [testenv]
 deps =