Release v2.2.24

Merge branch 'master' into 2.2
Update dependencies
2026-05-30 23:40:30 +03:00 · 2021-08-25 20:31:26 +09:30 · 2021-08-25 20:08:45 +09:30 · 2021-08-24 21:12:27 +09:30 · 2021-08-24 17:26:07 +09:30 · 2021-08-15 15:10:02 +09:30
9 changed files with 19 additions and 10 deletions
--- a/7
+++ b/7
@@ -1,5 +1,12 @@
 # Change Log

+## 2.2.24 25/08/2021
+
+* Fix incorrect Qemu binary selected when importing template. Fixes https://github.com/GNS3/gns3-gui/issues/3216
+* Early support for Python3.10
+* Bump pywin32 from 300 to 301
+* Add PyQt5==5.12.3 for macOS build
+
 ## 2.2.23 05/08/2021

 * Handle -no-kvm param deprecated in Qemu >= v5.2
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,5 +1,5 @@
 -rrequirements.txt

-pytest==5.4.3
-flake8==3.8.3
-pytest-timeout==1.4.1
+pytest==6.2.4
+flake8==3.9.2
+pytest-timeout==1.4.2
--- a/gns3/crash_report.py
+++ b/gns3/crash_report.py
@@ -51,7 +51,7 @@ class CrashReport:
    Report crash to a third party service
    """

-    DSN = "https://61741888663f4c5397e6cb7ff818a62b:ca196fe1e263480892906b6f9295f63b@o19455.ingest.sentry.io/38506"
+    DSN = "https://2ec08a0f8d314572b17dd2eba910a401:83d32ce66b444d0a81dd25170b4bfd34@o19455.ingest.sentry.io/38506"
    _instance = None

    def __init__(self):
--- a/gns3/dialogs/appliance_wizard.py
+++ b/gns3/dialogs/appliance_wizard.py
@@ -554,7 +554,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
            if self.uiQemuListComboBox.count() == 1:
                self.next()
            else:
-                i = self.uiQemuListComboBox.findText(self._appliance["qemu"]["arch"], QtCore.Qt.MatchContains)
+                i = self.uiQemuListComboBox.findData(self._appliance["qemu"]["arch"], flags=QtCore.Qt.MatchEndsWith)
                if i != -1:
                    self.uiQemuListComboBox.setCurrentIndex(i)

--- a/gns3/version.py
+++ b/gns3/version.py
@@ -23,8 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)

-__version__ = "2.2.23"
-__version_info__ = (2, 2, 23, 0)
+__version__ = "2.2.24"
+__version_info__ = (2, 2, 24, 0)

 if "dev" in __version__:
    try:
--- a/mac-requirements.txt
+++ b/mac-requirements.txt
@@ -1,2 +1,3 @@
 -rrequirements.txt

+PyQt5==5.12.3
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 jsonschema==3.2.0
-sentry-sdk==1.1.0
+sentry-sdk==1.3.1
 psutil==5.8.0
-distro==1.5.0
+distro==1.6.0
--- a/setup.py
+++ b/setup.py
@@ -97,6 +97,7 @@ setup(
        "Programming Language :: Python :: 3.7",
        "Programming Language :: Python :: 3.8",
        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
        "Programming Language :: Python :: Implementation :: CPython",
    ],
 )
--- a/win-requirements.txt
+++ b/win-requirements.txt
@@ -1,4 +1,4 @@
 -rrequirements.txt

 PyQt5==5.12.3 # pyup: ignore
-pywin32==300 # pyup: ignore
+pywin32==301 # pyup: ignore
Author	SHA1	Message	Date
grossmj	966873bc6c	Release v2.2.24	2021-08-25 20:31:26 +09:30
grossmj	5b9111b55d	Merge branch 'master' into 2.2	2021-08-25 20:08:45 +09:30
grossmj	56688f2236	Update dependencies	2021-08-24 21:12:27 +09:30
grossmj	2e656a9d53	Fix incorrect Qemu binary selected when importing template. Fixes https://github.com/GNS3/gns3-gui/issues/3216	2021-08-24 17:26:07 +09:30
grossmj	2790f707c3	Early support for Python3.10	2021-08-15 15:10:02 +09:30
Jeremy Grossmann	ee9002df61	Merge pull request #3217 from GNS3/dependabot/pip/pywin32-301 Bump pywin32 from 300 to 301	2021-08-09 17:59:04 -07:00
dependabot[bot]	52626e9fe9	Bump pywin32 from 300 to 301 Bumps [pywin32](https://github.com/mhammond/pywin32) from 300 to 301. - [Release notes](https://github.com/mhammond/pywin32/releases) - [Changelog](https://github.com/mhammond/pywin32/blob/master/CHANGES.txt) - [Commits](https://github.com/mhammond/pywin32/commits) --- updated-dependencies: - dependency-name: pywin32 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2021-08-09 20:48:41 +00:00
grossmj	6619c6af97	Add PyQt5==5.12.3 for macOS build	2021-08-07 20:09:41 +09:30
grossmj	60e04c7248	Development on 2.2.24dev1	2021-08-05 21:16:10 +09:30