Merge remote-tracking branch 'pyqt5-stubs/master' into qscrollarea-widgetresizeable

Author: bluebird75

.github/workflows/ci.yml

@@ -24,15 +24,13 @@ jobs:
         os:
           - name: Linux
             runs-on: ubuntu-latest
-            matrix: linux
-#          https://github.com/python-qt-tools/PyQt5-stubs/issues/122
-#          - name: Windows
-#            runs-on: windows-latest
-#            matrix: windows
-#          https://github.com/python-qt-tools/PyQt5-stubs/issues/122
-#          - name: macOS
-#            runs-on: macos-latest
-#            matrix: macos
+            tox: linux
+          - name: macOS
+            runs-on: macos-latest
+            tox: macos
+          - name: Windows
+            runs-on: windows-latest
+            tox: windows
         python:
           - name: CPython 3.6
             tox: py36
@@ -46,6 +44,9 @@ jobs:
           - name: CPython 3.9
             tox: py39
             action: 3.9
+          - name: CPython 3.10
+            tox: py310
+            action: '3.10'
     steps:
       - uses: actions/checkout@v2
       - name: Set up ${{ matrix.python.name }}
@@ -55,7 +56,7 @@ jobs:
           architecture: x64
       - uses: twisted/python-info-action@v1.0.1
       - name: Install Linux Qt5 dependencies
-        if: matrix.os.matrix == 'linux'
+        if: matrix.os.name == 'Linux'
         run: |
           sudo apt-get update --yes
           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
@@ -67,7 +68,7 @@ jobs:
           pip install tox
       - name: Test
         run: |
-          tox -v -e ${{ matrix.python.tox }}
+          tox -v -e ${{ matrix.python.tox }}-${{ matrix.os.tox }}
 
   all:
     name: All

CHANGELOG.md

@@ -7,10 +7,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [unreleased]
 
 ### Added
+* [#179](https://github.com/python-qt-tools/PyQt5-stubs/pull/179) update to PyQt5 5.15.6
+* [#176](https://github.com/python-qt-tools/PyQt5-stubs/pull/176) update to PyQt5 5.15.5
+* [#175](https://github.com/python-qt-tools/PyQt5-stubs/pull/175) catch up PyQtNetworkAuth with the 5.15.4 release
+* [#149](https://github.com/python-qt-tools/PyQt5-stubs/pull/149) update to PyQt5 5.15.4
 * [#138](https://github.com/python-qt-tools/PyQt5-stubs/pull/138) update to PyQt5 5.15.3
+* [#145](https://github.com/python-qt-tools/PyQt5-stubs/pull/145) Support all implemented arithmetic operations between Qt.WindowType and Qt.WindowFlags and int
 * [#144](https://github.com/python-qt-tools/PyQt5-stubs/pull/144) add `QTreeWidgetItem.__lt__()` to allow sorting of items in a QTreeWidget
+* [#143](https://github.com/python-qt-tools/PyQt5-stubs/pull/143) make `bytes(QByteArray())` valid by incorrectly adding `.__bytes__()` until a proper solution is developed upstream
+* [#152](https://github.com/python-qt-tools/PyQt5-stubs/pull/152) add `.__or__()` for `QDialogButtonBox.StandardButton` and `QDialogButtonBox.StandardButtons`
+* [#156](https://github.com/python-qt-tools/PyQt5-stubs/pull/156) add operators to `QSize` and `QSizeF`
+* [#153](https://github.com/python-qt-tools/PyQt5-stubs/pull/153) Support all implemented arithmetic operations for QFlags 
+  based classes in modules QtCore, QtWidgets, QtGui, QtNetwork, QtDBus, QtOpenGL, QtPrintsupport, QtSql, QtTest, QtXml
+* [#162](https://github.com/python-qt-tools/PyQt5-stubs/pull/162) fixes all method not declared as signals
+* [#184](https://github.com/python-qt-tools/PyQt5-stubs/pull/184) Fix missing module variable
+   detected by latest mypy 0.930
+* [#183](https://github.com/python-qt-tools/PyQt5-stubs/pull/183) Add missing operations on QSize
 * [#148](https://github.com/python-qt-tools/PyQt5-stubs/pull/148) add `widgetResizable` parameter to `QScrollArea.__init__()`
 
+
 ## 5.15.2.0
 
 ### Added

Dockerfile

@@ -2,18 +2,19 @@
 #       https://hub.docker.com/_/archlinux?tab=tags&page=1&ordering=last_updated
 # BUILD_DATE is a path from:
 #       https://archive.archlinux.org/repos/
-ARG ARCH_VERSION="base-20210221.0.15908"
-ARG BUILD_DATE="2021/02/25"
-
-ARG SIP_VERSION="6.0.2"
-# Also the major.minor of PyQt5-sip
-ARG SIP_ABI_VERSION="12.8"
-ARG PYQT_VERSION="5.15.3"
-ARG PYQT_3D_VERSION="5.15.3"
-ARG PYQT_CHART_VERSION="5.15.3"
-ARG PYQT_DATA_VISUALIZATION_VERSION="5.15.3"
-ARG PYQT_PURCHASING_VERSION="5.15.3"
-ARG PYQT_WEB_ENGINE_VERSION="5.15.3"
+ARG ARCH_VERSION="base-20211121.0.39613"
+ARG BUILD_DATE="2021/11/29"
+
+ARG SIP_VERSION="6.4.0"
+# Also the major of PyQt5-sip
+ARG SIP_ABI_VERSION="12"
+ARG PYQT_VERSION="5.15.6"
+ARG PYQT_3D_VERSION="5.15.5"
+ARG PYQT_CHART_VERSION="5.15.5"
+ARG PYQT_DATA_VISUALIZATION_VERSION="5.15.5"
+ARG PYQT_PURCHASING_VERSION="5.15.5"
+ARG PYQT_WEB_ENGINE_VERSION="5.15.5"
+ARG PYQT_NETWORK_AUTH_VERSION="5.15.5"
 
 ARG MAKEFLAGS=""
 
@@ -301,6 +302,39 @@ RUN sip-install \
 WORKDIR /output/
 RUN find /upstream/ -name \*.pyi -exec cp {} . \;
 
+################################################################################
+# PyQtNetworkAuth
+################################################################################
+
+FROM build-dep AS pyqt-network-auth
+
+# Reuse arguments from previous build scope
+ARG MAKEFLAGS
+ARG PYQT_NETWORK_AUTH_VERSION
+
+# Download source tar
+RUN wget --no-verbose \
+    --output-document upstream.tar.gz \
+    https://pypi.io/packages/source/p/pyqtnetworkauth/PyQtNetworkAuth-${PYQT_NETWORK_AUTH_VERSION}.tar.gz
+RUN mkdir /upstream/ && \
+    tar -xf \
+        upstream.tar.gz \
+        --directory /upstream/ \
+        --strip-components 1
+
+# Build PyQtNetworkAuth with stubs
+# TODO: Find way to build only stubs
+WORKDIR /upstream/
+RUN sip-install \
+    --qmake /usr/bin/qmake-qt5 \
+    --pep484-pyi \
+    --build-dir ./build \
+    --verbose
+
+# Copy all .pyi files to output dir
+WORKDIR /output/
+RUN find /upstream/ -name \*.pyi -exec cp {} . \;
+
 ################################################################################
 # Output
 ################################################################################
@@ -316,6 +350,7 @@ COPY --from=pyqt-chart /output/* ./
 COPY --from=pyqt-data-visualization /output/* ./
 COPY --from=pyqt-purchasing /output/* ./
 COPY --from=pyqt-web-engine /output/* ./
+COPY --from=pyqt-network-auth /output/* ./
 
 # Required to run the image (which we need to do to get the files)
 CMD /bin/true