Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gns3-gui for openSUSE:Factory checked in at 2022-05-02 16:24:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gns3-gui (Old) and /work/SRC/openSUSE:Factory/.gns3-gui.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gns3-gui" Mon May 2 16:24:57 2022 rev:14 rq:974203 version:2.2.31 Changes: -------- --- /work/SRC/openSUSE:Factory/gns3-gui/gns3-gui.changes 2021-12-21 18:41:08.653901448 +0100 +++ /work/SRC/openSUSE:Factory/.gns3-gui.new.1538/gns3-gui.changes 2022-05-02 16:25:07.876808966 +0200 @@ -1,0 +2,14 @@ +Sun Apr 24 19:46:17 UTC 2022 - Martin Hauke <mar...@gmx.de> + +- Update to version 2.2.31 + * Fix int() call. Ref #3283 + * Fix QPoint() as unexpected type 'float'. Fixes #3283 + * Fix painter.drawRect() has unexpected type 'float'. Fixes #3282 + * Fix SpinBox.setValue() requires integer. Fixes #3281 + * Clear cache when opening symbol selection dialog. Fixes #3256 + * Fix @ in username issue with HTTP authentication. Fixes #3275 + * Use '//' operator instead of int() + * Fix create drawing item calls since mapToScene() returns a QPointF + * Fixed QPoint called with floats + +------------------------------------------------------------------- Old: ---- gns3-gui-2.2.28.tar.gz New: ---- gns3-gui-2.2.31.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gns3-gui.spec ++++++ --- /var/tmp/diff_new_pack.NjITIL/_old 2022-05-02 16:25:08.460809615 +0200 +++ /var/tmp/diff_new_pack.NjITIL/_new 2022-05-02 16:25:08.464809619 +0200 @@ -1,7 +1,7 @@ # # spec file for package gns3-gui # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gns3-gui -Version: 2.2.28 +Version: 2.2.31 Release: 0 Summary: GNS3 graphical interface for the GNS3 server License: GPL-3.0-or-later @@ -37,10 +37,10 @@ Requires: python3-jsonschema < 3 Requires: python3-jsonschema >= 2.4.0 %endif -Requires: python3-distro >= 1.3.0 +Requires: python3-distro >= 1.6.0 Requires: python3-psutil >= 2.2.1 Requires: python3-qt5 -Requires: python3-sentry-sdk >= 0.14.4 +Requires: python3-sentry-sdk >= 1.5.4 Recommends: gns3-server Recommends: libcap-progs Recommends: sudo ++++++ gns3-gui-2.2.28.tar.gz -> gns3-gui-2.2.31.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/CHANGELOG new/gns3-gui-2.2.31/CHANGELOG --- old/gns3-gui-2.2.28/CHANGELOG 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/CHANGELOG 2022-02-26 08:52:17.000000000 +0100 @@ -1,5 +1,26 @@ # Change Log +## 2.2.31 26/02/2022 + +* Install setuptools v59.6.0 when using Python 3.6 + +## 2.2.30 25/02/2022 + +* Set setuptools to v60.6.0 +* Upgrade to pywin32 v303. Ref #3290 +* Fix int() call. Ref #3283 +* Fix QPoint() as unexpected type 'float'. Fixes #3283 +* Fix painter.drawRect() has unexpected type 'float'. Fixes #3282 +* Fix SpinBox.setValue() requires integer. Fixes #3281 + +## 2.2.29 08/01/2022 + +* Clear cache when opening symbol selection dialog. Fixes #3256 +* Fix @ in username issue with HTTP authentication. Fixes #3275 +* Use '//' operator instead of int() +* Fix create drawing item calls since mapToScene() returns a QPointF https://doc.qt.io/qt-5/qgraphicsview.html#mapToScene-4 +* Fixed QPoint called with floats + ## 2.2.28 15/12/2021 * Fixed drawLine called with float arguments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/crash_report.py new/gns3-gui-2.2.31/gns3/crash_report.py --- old/gns3-gui-2.2.28/gns3/crash_report.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/crash_report.py 2022-02-26 08:52:17.000000000 +0100 @@ -51,7 +51,7 @@ Report crash to a third party service """ - DSN = "https://afea6dfc1b52427daa40387216e31764:2aeb84def9164bfaa2136d2684892...@o19455.ingest.sentry.io/38506"; + DSN = "https://3af06592e0804039befaae43066b8fb8:73e4b6fd709e4622a60c86ac5ece6...@o19455.ingest.sentry.io/38506"; _instance = None def __init__(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/dialogs/style_editor_dialog.py new/gns3-gui-2.2.31/gns3/dialogs/style_editor_dialog.py --- old/gns3-gui-2.2.28/gns3/dialogs/style_editor_dialog.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/dialogs/style_editor_dialog.py 2022-02-26 08:52:17.000000000 +0100 @@ -70,7 +70,7 @@ self._border_color.green(), self._border_color.blue(), self._border_color.alpha())) - self.uiRotationSpinBox.setValue(first_item.rotation()) + self.uiRotationSpinBox.setValue(int(first_item.rotation())) self.uiBorderWidthSpinBox.setValue(pen.width()) index = self.uiBorderStyleComboBox.findData(pen.style()) if index != -1: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/dialogs/symbol_selection_dialog.py new/gns3-gui-2.2.31/gns3/dialogs/symbol_selection_dialog.py --- old/gns3-gui-2.2.28/gns3/dialogs/symbol_selection_dialog.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/dialogs/symbol_selection_dialog.py 2022-02-26 08:52:17.000000000 +0100 @@ -67,6 +67,7 @@ self._symbol_items = [] self._parents = {} + Controller.instance().clearStaticCache() # TODO: use etag to know when to refresh the cache Controller.instance().get("/symbols", self._listSymbolsCallback) def _listSymbolsCallback(self, result, error=False, **kwargs): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/dialogs/text_editor_dialog.py new/gns3-gui-2.2.31/gns3/dialogs/text_editor_dialog.py --- old/gns3-gui-2.2.28/gns3/dialogs/text_editor_dialog.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/dialogs/text_editor_dialog.py 2022-02-26 08:52:17.000000000 +0100 @@ -44,7 +44,7 @@ # use the first item in the list as the model first_item = items[0] self._setColor(first_item.defaultTextColor()) - self.uiRotationSpinBox.setValue(first_item.rotation()) + self.uiRotationSpinBox.setValue(int(first_item.rotation())) self.uiPlainTextEdit.setPlainText(first_item.toPlainText()) self.uiPlainTextEdit.setFont(first_item.font()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/graphics_view.py new/gns3-gui-2.2.31/gns3/graphics_view.py --- old/gns3-gui-2.2.28/gns3/graphics_view.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/graphics_view.py 2022-02-26 08:52:17.000000000 +0100 @@ -473,7 +473,7 @@ #QtWidgets.QApplication.sendEvent(self, context_event) elif event.button() == QtCore.Qt.LeftButton and self._adding_note: pos = self.mapToScene(event.pos()) - note = self.createDrawingItem("text", pos.x(), pos.y(), 2) + note = self.createDrawingItem("text", int(pos.x()), int(pos.y()), 2) pos_x = note.pos().x() pos_y = note.pos().y() - (note.boundingRect().height() / 2) note.setPos(pos_x, pos_y) @@ -483,19 +483,19 @@ self._adding_note = False elif event.button() == QtCore.Qt.LeftButton and self._adding_rectangle: pos = self.mapToScene(event.pos()) - self.createDrawingItem("rect", pos.x(), pos.y(), 1) + self.createDrawingItem("rect", int(pos.x()), int(pos.y()), 1) self._main_window.uiDrawRectangleAction.setChecked(False) self.setCursor(QtCore.Qt.ArrowCursor) self._adding_rectangle = False elif event.button() == QtCore.Qt.LeftButton and self._adding_ellipse: pos = self.mapToScene(event.pos()) - self.createDrawingItem("ellipse", pos.x(), pos.y(), 1) + self.createDrawingItem("ellipse", int(pos.x()), int(pos.y()), 1) self._main_window.uiDrawEllipseAction.setChecked(False) self.setCursor(QtCore.Qt.ArrowCursor) self._adding_ellipse = False elif event.button() == QtCore.Qt.LeftButton and self._adding_line: pos = self.mapToScene(event.pos()) - self.createDrawingItem("line", pos.x(), pos.y(), 1) + self.createDrawingItem("line", int(pos.x()), int(pos.y()), 1) self._main_window.uiDrawLineAction.setChecked(False) self.setCursor(QtCore.Qt.ArrowCursor) self._adding_line = False @@ -723,8 +723,8 @@ integer, ok = QtWidgets.QInputDialog.getInt(self, "Nodes", "Number of nodes:", 2, 1, 100, 1) if ok: for node_number in range(integer): - x = event.pos().x() - (150 / 2) + (node_number % max_nodes_per_line) * offset - y = event.pos().y() - (70 / 2) + (node_number // max_nodes_per_line) * offset + x = event.pos().x() - (150 // 2) + (node_number % max_nodes_per_line) * offset + y = event.pos().y() - (70 // 2) + (node_number // max_nodes_per_line) * offset if self.createNodeFromTemplateId(template_id, QtCore.QPoint(x, y)) is False: event.ignore() break @@ -1411,7 +1411,15 @@ type = "rect" else: type = "image" - self.createDrawingItem(type, item.pos().x() + 20, item.pos().y() + 20, item.zValue(), rotation=item.rotation(), svg=item.toSvg()) + + self.createDrawingItem( + type, + int(item.pos().x()) + 20, + int(item.pos().y()) + 20, + item.zValue(), + rotation=item.rotation(), + svg=item.toSvg() + ) elif isinstance(item, NodeItem): item.node().duplicate(item.pos().x() + 20, item.pos().y() + 20, item.zValue()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/http_client.py new/gns3-gui-2.2.31/gns3/http_client.py --- old/gns3-gui-2.2.28/gns3/http_client.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/http_client.py 2022-02-26 08:52:17.000000000 +0100 @@ -554,14 +554,13 @@ query_string = self._paramsToQueryString(params) log.debug("{method} {protocol}://{host}:{port}{prefix}{path} {body}{query_string}".format(method=method, protocol=self._protocol, host=host, port=self._port, path=path, body=body, prefix=prefix, query_string=query_string)) + url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{path}{query_string}".format(protocol=self._protocol, host=host, port=self._port, path=path, prefix=prefix, query_string=query_string)) + if self._user: - url = QtCore.QUrl("{protocol}://{user}@{host}:{port}{prefix}{path}{query_string}".format(protocol=self._protocol, user=self._user, host=host, port=self._port, path=path, prefix=prefix, query_string=query_string)) - else: - url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{path}{query_string}".format(protocol=self._protocol, host=host, port=self._port, path=path, prefix=prefix, query_string=query_string)) - request = self._request(url) + url.setUserName(self._user) + request = self._request(url) request = self._addAuth(request) - request.setRawHeader(b"User-Agent", "GNS3 QT Client v{version}".format(version=__version__).encode()) # By default QT doesn't support GET with body even if it's in the RFC that's why we need to use sendCustomRequest @@ -759,10 +758,10 @@ host = self._getHostForQuery() log.debug("{method} {protocol}://{host}:{port}{prefix}{endpoint}".format(method=method, protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint)) + url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint)) + if self._user: - url = QtCore.QUrl("{protocol}://{user}@{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, user=self._user, host=host, port=self._port, prefix=prefix, endpoint=endpoint)) - else: - url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint)) + url.setUserName(self._user) request = self._request(url) request = self._addAuth(request) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/items/drawing_item.py new/gns3-gui-2.2.31/gns3/items/drawing_item.py --- old/gns3-gui-2.2.28/gns3/items/drawing_item.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/items/drawing_item.py 2022-02-26 08:52:17.000000000 +0100 @@ -246,7 +246,7 @@ center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0) painter.setBrush(QtCore.Qt.red) painter.setPen(QtCore.Qt.red) - painter.drawRect((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20) + painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20)) painter.setPen(QtCore.Qt.black) zval = str(int(self.zValue())) painter.drawText(QtCore.QPointF(center.x() - 4, center.y() + 4), zval) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/items/label_item.py new/gns3-gui-2.2.31/gns3/items/label_item.py --- old/gns3-gui-2.2.28/gns3/items/label_item.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/items/label_item.py 2022-02-26 08:52:17.000000000 +0100 @@ -165,7 +165,7 @@ center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0) painter.setBrush(QtCore.Qt.red) painter.setPen(QtCore.Qt.red) - painter.drawRect((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20) + painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20)) painter.setPen(QtCore.Qt.black) zval = str(int(self.zValue())) painter.drawText(QtCore.QPointF(center.x(), center.y()), zval) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/items/node_item.py new/gns3-gui-2.2.31/gns3/items/node_item.py --- old/gns3-gui-2.2.28/gns3/items/node_item.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/items/node_item.py 2022-02-26 08:52:17.000000000 +0100 @@ -507,7 +507,7 @@ center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0) painter.setBrush(QtCore.Qt.red) painter.setPen(QtCore.Qt.red) - painter.drawRect((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20) + painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20)) painter.setPen(QtCore.Qt.black) if self.show_layer: text = str(int(self.zValue())) # Z value diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/gns3/version.py new/gns3-gui-2.2.31/gns3/version.py --- old/gns3-gui-2.2.28/gns3/version.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/gns3/version.py 2022-02-26 08:52:17.000000000 +0100 @@ -23,8 +23,8 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.2.28" -__version_info__ = (2, 2, 28, 0) +__version__ = "2.2.31" +__version_info__ = (2, 2, 31, 0) if "dev" in __version__: try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/mac-requirements.txt new/gns3-gui-2.2.31/mac-requirements.txt --- old/gns3-gui-2.2.28/mac-requirements.txt 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/mac-requirements.txt 2022-02-26 08:52:17.000000000 +0100 @@ -1,3 +1,3 @@ -rrequirements.txt -PyQt5==5.15.4 +PyQt5==5.15.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/requirements.txt new/gns3-gui-2.2.31/requirements.txt --- old/gns3-gui-2.2.28/requirements.txt 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/requirements.txt 2022-02-26 08:52:17.000000000 +0100 @@ -1,5 +1,6 @@ jsonschema==3.2.0 -sentry-sdk==1.3.1 -psutil==5.8.0 +sentry-sdk==1.5.4 +psutil==5.9.0 distro==1.6.0 -setuptools +setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 +setuptools==59.6.0; python_version < '3.7' # v59.7.0 dropped support for Python 3.6 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/tests/test_link.py new/gns3-gui-2.2.31/tests/test_link.py --- old/gns3-gui-2.2.28/tests/test_link.py 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/tests/test_link.py 2022-02-26 08:52:17.000000000 +0100 @@ -104,9 +104,6 @@ assert link._link_id is not None assert not devices[0].ports()[0].isFree() - assert link in devices[0].links() - assert link in devices[1].links() - assert link.getNodePort(devices[0]) == devices[0].ports()[0] assert link.getNodePort(devices[1]) == devices[1].ports()[0] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gns3-gui-2.2.28/win-requirements.txt new/gns3-gui-2.2.31/win-requirements.txt --- old/gns3-gui-2.2.28/win-requirements.txt 2021-12-15 04:24:24.000000000 +0100 +++ new/gns3-gui-2.2.31/win-requirements.txt 2022-02-26 08:52:17.000000000 +0100 @@ -1,4 +1,4 @@ -rrequirements.txt -PyQt5==5.15.4 # pyup: ignore -pywin32==301 # pyup: ignore +PyQt5==5.15.6 # pyup: ignore +pywin32==303 # pyup: ignore ++++++ gns3-gui-fix-requirements.patch ++++++ --- /var/tmp/diff_new_pack.NjITIL/_old 2022-05-02 16:25:08.916810122 +0200 +++ /var/tmp/diff_new_pack.NjITIL/_new 2022-05-02 16:25:08.920810127 +0200 @@ -1,12 +1,17 @@ diff --git a/requirements.txt b/requirements.txt -index 0b5f89d..1cb7f82 100644 +index 46f8d44..fc0140c 100644 --- a/requirements.txt +++ b/requirements.txt -@@ -1,4 +1,4 @@ - jsonschema==3.2.0 --sentry-sdk==1.3.1 --psutil==5.8.0 -+sentry-sdk>=1.3.1 -+psutil>=5.6.7 - distro==1.6.0 +@@ -1,6 +1,4 @@ +-jsonschema==3.2.0 +-sentry-sdk==1.5.4 +-psutil==5.9.0 +-distro==1.6.0 +-setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 +-setuptools==59.6.0; python_version < '3.7' # v59.7.0 dropped support for Python 3.6 +\ No newline at end of file ++jsonschema>=3.2.0 ++sentry-sdk>=1.5.4 ++psutil>=5.9.0 ++distro>=1.6.0
