diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57157467..2d8a82a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,6 @@ jobs: if: matrix.os.name == 'Linux' run: | sudo apt-get update --yes - sudo apt-get install --yes libgl1 # Required to stubtest QtMultimedia sudo apt-get install --yes libpulse-mainloop-glib0 sudo apt-get install --yes libgl1 libgl1-mesa-dev xvfb x11-utils libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 diff --git a/CHANGELOG.md b/CHANGELOG.md index f3d0302e..b1ec942f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * [#183](https://github.com/python-qt-tools/PyQt5-stubs/pull/183) Add missing operations on QSize * [#189](https://github.com/python-qt-tools/PyQt5-stubs/pull/189) Fix QListWidget, QTreeWidget and QTableWidget so that their respective items are now optional in many places when used as argument or return value * [#165](https://github.com/python-qt-tools/PyQt5-stubs/pull/165) allow `None` as argument for `QLineEdit.setText()` +* [#148](https://github.com/python-qt-tools/PyQt5-stubs/pull/148) add `widgetResizable` parameter to `QScrollArea.__init__()` and `objectName` parameter to `QGroupBox.__init__()`. + ## 5.15.2.0 diff --git a/PyQt5-stubs/QtWidgets.pyi b/PyQt5-stubs/QtWidgets.pyi index 09275fec..adf0c2ca 100644 --- a/PyQt5-stubs/QtWidgets.pyi +++ b/PyQt5-stubs/QtWidgets.pyi @@ -6540,9 +6540,9 @@ class QGridLayout(QLayout): class QGroupBox(QWidget): @typing.overload - def __init__(self, parent: typing.Optional[QWidget] = ...) -> None: ... + def __init__(self, parent: typing.Optional[QWidget] = ..., *, objectName: str = ...) -> None: ... @typing.overload - def __init__(self, title: str, parent: typing.Optional[QWidget] = ...) -> None: ... + def __init__(self, title: str, parent: typing.Optional[QWidget] = ..., *, objectName: str = ...) -> None: ... def mouseReleaseEvent(self, event: QtGui.QMouseEvent) -> None: ... def mouseMoveEvent(self, event: QtGui.QMouseEvent) -> None: ... @@ -8431,7 +8431,7 @@ class QRubberBand(QWidget): class QScrollArea(QAbstractScrollArea): - def __init__(self, parent: typing.Optional[QWidget] = ...) -> None: ... + def __init__(self, parent: typing.Optional[QWidget] = ..., *, widgetResizable: bool = ...) -> None: ... def viewportSizeHint(self) -> QtCore.QSize: ... def scrollContentsBy(self, dx: int, dy: int) -> None: ... diff --git a/setup.py b/setup.py index 202093d9..0eb08801 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ def find_version(*file_paths): packages=["PyQt5-stubs"], extras_require={ "build": ["docker==4.2.0"], - "dev": ["mypy", "pytest", "pytest-xvfb"], + "dev": ["mypy==0.930", "pytest", "pytest-xvfb"], }, classifiers=[ "Development Status :: 4 - Beta", diff --git a/tests/qgroupbox.py b/tests/qgroupbox.py new file mode 100644 index 00000000..3dd6d317 --- /dev/null +++ b/tests/qgroupbox.py @@ -0,0 +1,3 @@ +from PyQt5.QtWidgets import QGroupBox + +groupBox = QGroupBox(objectName='some_name') diff --git a/tests/qscrollarea.py b/tests/qscrollarea.py new file mode 100644 index 00000000..a0f1c25f --- /dev/null +++ b/tests/qscrollarea.py @@ -0,0 +1,3 @@ +from PyQt5.QtWidgets import QScrollArea + +scrollArea = QScrollArea(widgetResizable=True) diff --git a/tests/simple.py b/tests/simple.py deleted file mode 100644 index 0c65dfdf..00000000 --- a/tests/simple.py +++ /dev/null @@ -1 +0,0 @@ -from PyQt5 import QtCore