Skip to content

Commit 9c0300a

Browse files
committed
Merge branch 'master' into StandardButton__or__
2 parents f10f71b + 79844be commit 9c0300a

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

Dockerfile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
# Careful, the version and build date are both dates, but different formats
2-
ARG ARCH_VERSION="20200908"
3-
ARG BUILD_DATE="2020/09/18"
1+
# ARCH_VERSION is a tag available from:
2+
# https://hub.docker.com/_/archlinux?tab=tags&page=1&ordering=last_updated
3+
# BUILD_DATE is a path from:
4+
# https://archive.archlinux.org/repos/
5+
ARG ARCH_VERSION="base-20201129.0.10056"
6+
ARG BUILD_DATE="2020/12/02"
47

58
ARG SIP_VERSION="5.4.0"
69
# Also the major.minor of PyQt5-sip
710
ARG SIP_ABI_VERSION="12.8"
8-
ARG PYQT_VERSION="5.15.1"
9-
ARG PYQT_3D_VERSION="5.15.1"
10-
ARG PYQT_CHART_VERSION="5.15.1"
11-
ARG PYQT_DATA_VISUALIZATION_VERSION="5.15.1"
12-
ARG PYQT_PURCHASING_VERSION="5.15.1"
13-
ARG PYQT_WEB_ENGINE_VERSION="5.15.1"
11+
ARG PYQT_VERSION="5.15.2"
12+
ARG PYQT_3D_VERSION="5.15.2"
13+
ARG PYQT_CHART_VERSION="5.15.2"
14+
ARG PYQT_DATA_VISUALIZATION_VERSION="5.15.2"
15+
ARG PYQT_PURCHASING_VERSION="5.15.2"
16+
ARG PYQT_WEB_ENGINE_VERSION="5.15.2"
1417

1518
ARG MAKEFLAGS=""
1619

PyQt5-stubs/QtCore.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4494,7 +4494,7 @@ class QItemSelectionModel(QObject):
44944494
def currentColumnChanged(self, current: QModelIndex, previous: QModelIndex) -> None: ...
44954495
def currentRowChanged(self, current: QModelIndex, previous: QModelIndex) -> None: ...
44964496
def currentChanged(self, current: QModelIndex, previous: QModelIndex) -> None: ...
4497-
def selectionChanged(self, selected: 'QItemSelection', deselected: 'QItemSelection') -> None: ...
4497+
selectionChanged: typing.ClassVar[pyqtSignal]
44984498
def clearCurrentIndex(self) -> None: ...
44994499
def setCurrentIndex(self, index: QModelIndex, command: typing.Union['QItemSelectionModel.SelectionFlags', 'QItemSelectionModel.SelectionFlag']) -> None: ...
45004500
@typing.overload

PyQt5-stubs/QtNetwork.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PYQT_SLOT = typing.Union[typing.Callable[..., None], QtCore.pyqtBoundSignal]
3333

3434

3535
class QOcspRevocationReason(int): ...
36-
# None = ... # type: QOcspRevocationReason
36+
None_ = ... # type: QOcspRevocationReason
3737
Unspecified = ... # type: QOcspRevocationReason
3838
KeyCompromise = ... # type: QOcspRevocationReason
3939
CACompromise = ... # type: QOcspRevocationReason

PyQt5-stubs/QtWidgets.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ class QAction(QtCore.QObject):
10371037
class QActionGroup(QtCore.QObject):
10381038

10391039
class ExclusionPolicy(int): ...
1040-
# None = ... # type: 'QActionGroup.ExclusionPolicy'
1040+
None_ = ... # type: 'QActionGroup.ExclusionPolicy'
10411041
Exclusive = ... # type: 'QActionGroup.ExclusionPolicy'
10421042
ExclusiveOptional = ... # type: 'QActionGroup.ExclusionPolicy'
10431043

PyQt5-stubs/__init__.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "5.15.1.0"
1+
__version__ = "5.15.2.0"

0 commit comments

Comments
 (0)