From 6b3d4feab88c29c97e31b6894063acee92bd7dc1 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 11 Oct 2022 23:28:11 +0800 Subject: [PATCH 1/4] Replace deprecated distro.linux_distribution() call --- gns3server/crash_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index 31d4b37e..459d2e5d 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -93,7 +93,7 @@ class CrashReport: "os:release": platform.release(), "os:win_32": " ".join(platform.win32_ver()), "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]), - "os:linux": " ".join(distro.linux_distribution()), + "os:linux": distro.name(pretty=True), } From a6959de1f83ec0cc613ff274346bc273b4a1b2fa Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 18 Oct 2022 21:14:53 +0800 Subject: [PATCH 2/4] Upgrade pytest. Fixes #2130 --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 86cc066f..ea23ee1f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ -rrequirements.txt pytest==7.0.1; python_version < '3.7' # last version to support Python 3.6 -pytest==7.1.2; python_version >= '3.7' +pytest==7.1.3; python_version >= '3.7' flake8==5.0.4 pytest-timeout==2.1.0 pytest-aiohttp==0.3.0; python_version < '3.7' # last version to support Python 3.6 From de1654a50f9ed137c14e4383694f4143cb5fd056 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 18 Oct 2022 21:40:08 +0800 Subject: [PATCH 3/4] Upgrade pip and setuptools in appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index db38580a..9ddf6932 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,7 @@ environment: 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 c7df8331edd54c4b3d09f2540bc5985bb2682855 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 18 Oct 2022 21:47:10 +0800 Subject: [PATCH 4/4] Upgrade to Visual Studio 2022 in appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9ddf6932..1a90685d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ version: '{build}-{branch}' -image: Visual Studio 2015 +image: Visual Studio 2022 platform: x64