From ca94c71bf2d85126f3dec64526e27491ddadf94f Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 8 Nov 2022 23:09:23 +0800 Subject: [PATCH 1/5] Use Visual Studio 2022 in appveyor.yml --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1e7b3946b..b6ee34cee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,15 +1,16 @@ version: '{build}-{branch}' -image: Visual Studio 2017 +image: Visual Studio 2022 platform: x64 environment: - PYTHON: "C:\\Python36-x64" + PYTHON: "C:\\Python37-x64" DISTUTILS_USE_SDK: "1" install: - cinst nmap + - "%PYTHON%\\python.exe -m pip install -U pip setuptools" # upgrade pip & setuptools first - "%PYTHON%\\python.exe -m pip install -r dev-requirements.txt" - "%PYTHON%\\python.exe -m pip install -r win-requirements.txt" From 6f418f085364fe879f54d381c04df78b88758114 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 10 Nov 2022 22:21:14 +0800 Subject: [PATCH 2/5] Release v2.2.35.1 --- CHANGELOG | 4 ++++ gns3/crash_report.py | 2 +- gns3/version.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index dfb88e88e..348b0911e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Change Log +## 2.2.35.1 10/11/2022 + +* Re-release Web-Ui v2.2.35 + ## 2.2.35 08/11/2022 * Fix "variables": [] in project file leads to unlimited increase of empty name/value pairs in GUI. Fixes #3397 diff --git a/gns3/crash_report.py b/gns3/crash_report.py index b3045af2e..6fc374c7f 100644 --- 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://17ac557593f94e3993ed3d717759fd88@o19455.ingest.sentry.io/38506" + DSN = "https://39e46fb691d747b7ae539629f04650ae@o19455.ingest.sentry.io/38506" _instance = None def __init__(self): diff --git a/gns3/version.py b/gns3/version.py index ec3fe8018..1b5c20985 100644 --- 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.36.dev1" -__version_info__ = (2, 2, 36, 99) +__version__ = "2.2.35.1" +__version_info__ = (2, 2, 35, 0) if "dev" in __version__: try: From e68937475fbc6f4817a2c91fb5cfbdf39aaeb6cc Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 11 Nov 2022 00:36:47 +0800 Subject: [PATCH 3/5] Development on v2.2.36.dev2 --- gns3/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3/version.py b/gns3/version.py index 1b5c20985..75f27d072 100644 --- 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.35.1" -__version_info__ = (2, 2, 35, 0) +__version__ = "2.2.36.dev2" +__version_info__ = (2, 2, 36, 99) if "dev" in __version__: try: From 833b9d00c99021c64fbf2b4be339ace6309ce1d3 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sun, 18 Dec 2022 14:14:56 +0800 Subject: [PATCH 4/5] Upgrade dependencies --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0ef96872b..f2cdeafe1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -jsonschema>=4.17.0,<4.18; python_version >= '3.7' +jsonschema>=4.17.3,<4.18; python_version >= '3.7' jsonschema==3.2.0; python_version < '3.7' # v3.2.0 is the last version to support Python 3.6 -sentry-sdk==1.10.1,<1.11 -psutil==5.9.2 +sentry-sdk==1.12.0,<1.13 +psutil==5.9.4 distro>=1.7.0 setuptools>=60.8.1; python_version >= '3.7' setuptools==59.6.0; python_version < '3.7' # v59.6.0 is the last version to support Python 3.6 From 6e7947eea394fefe627913a91dbcb6c44078f5c6 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Dec 2022 11:19:29 +0800 Subject: [PATCH 5/5] Remove deprecated PuTTY option in preferences. Ref https://github.com/GNS3/gns3-gui/discussions/3415 --- gns3/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gns3/settings.py b/gns3/settings.py index df41c1569..f37202a2f 100644 --- a/gns3/settings.py +++ b/gns3/settings.py @@ -56,7 +56,6 @@ program_files_x86 = program_files = os.environ["PROGRAMFILES"] PRECONFIGURED_TELNET_CONSOLE_COMMANDS = {'Putty (normal standalone version)': 'putty_standalone.exe -telnet %h %p -loghost "%d"', - 'Putty (custom deprecated version)': 'putty.exe -telnet %h %p -wt "%d" -gns3 5 -skin 4', 'MobaXterm': r'"{}\Mobatek\MobaXterm Personal Edition\MobaXterm.exe" -newtab "telnet %h %p"'.format(program_files_x86), 'Royal TS V3': r'{}\code4ward.net\Royal TS V3\RTS3App.exe /connectadhoc:%h /adhoctype:terminal /p:IsTelnetConnection="true" /p:ConnectionType="telnet;Telnet Connection" /p:Port="%p" /p:Name="%d"'.format(program_files), 'Royal TS V5': r'"{}\Royal TS V5\RoyalTS.exe" /protocol:terminal /using:adhoc /uri:"%h" /property:Port="%p" /property:IsTelnetConnection="true" /property:Name="%d"'.format(program_files_x86),