From dbe8df5a376f967921471cc8f5c6992a23ab40a6 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 19 Sep 2023 21:08:24 +0700 Subject: [PATCH 01/11] Development on 2.2.44.dev1 --- gns3/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3/version.py b/gns3/version.py index b8c19a66e..56fc56cd3 100644 --- a/gns3/version.py +++ b/gns3/version.py @@ -23,9 +23,9 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.2.43" +__version__ = "2.2.44.dev1" -__version_info__ = (2, 2, 43, 0) +__version_info__ = (2, 2, 44, 99) if "dev" in __version__: try: From 7222da9512088a7bb56da8231f7338e9d1278a76 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 23 Sep 2023 14:33:15 +1000 Subject: [PATCH 02/11] Install importlib-resources only with Python < '3.9'. Ref #2147 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 345b56fa7..3455f852e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ sentry-sdk==1.31.0,<1.32 psutil==5.9.5 distro>=1.8.0 truststore>=0.8.0; python_version >= '3.10' -importlib-resources>=1.3; python_version <= '3.9' +importlib-resources>=1.3; python_version < '3.9' 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 3413afe952ecfda3a0b6171d2021279d1faceeee Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 23 Sep 2023 14:47:56 +1000 Subject: [PATCH 03/11] Revert "Install importlib-resources only with Python < '3.9'. Ref #2147" This reverts commit 7222da9512088a7bb56da8231f7338e9d1278a76. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3455f852e..345b56fa7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ sentry-sdk==1.31.0,<1.32 psutil==5.9.5 distro>=1.8.0 truststore>=0.8.0; python_version >= '3.10' -importlib-resources>=1.3; python_version < '3.9' +importlib-resources>=1.3; python_version <= '3.9' 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 10afb5a8deb25b85c26c38d1f9639ba833dd0000 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 23 Sep 2023 20:50:39 +1000 Subject: [PATCH 04/11] Revert "Revert "Install importlib-resources only with Python < '3.9'. Ref #2147"" This reverts commit 3413afe952ecfda3a0b6171d2021279d1faceeee. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 345b56fa7..3455f852e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,6 @@ sentry-sdk==1.31.0,<1.32 psutil==5.9.5 distro>=1.8.0 truststore>=0.8.0; python_version >= '3.10' -importlib-resources>=1.3; python_version <= '3.9' +importlib-resources>=1.3; python_version < '3.9' 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 3e717999ca460b28183e95a90eee70787556882b Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 9 Oct 2023 16:52:52 +1000 Subject: [PATCH 05/11] Add vendor_logo_url in appliance schemas. Ref https://github.com/GNS3/gns3-registry/pull/825 --- gns3/schemas/appliance.json | 5 +++++ gns3/schemas/appliance_v8.json | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/gns3/schemas/appliance.json b/gns3/schemas/appliance.json index 2a9005fc1..78b7c004a 100644 --- a/gns3/schemas/appliance.json +++ b/gns3/schemas/appliance.json @@ -71,6 +71,11 @@ "format": "uri", "title": "Website of the vendor" }, + "vendor_logo_url": { + "type": "string", + "format": "uri", + "title": "Link to the vendor logo (used by the GNS3 marketplace)" + }, "documentation_url": { "type": "string", "format": "uri", diff --git a/gns3/schemas/appliance_v8.json b/gns3/schemas/appliance_v8.json index 4fb0db7b6..e120c8313 100644 --- a/gns3/schemas/appliance_v8.json +++ b/gns3/schemas/appliance_v8.json @@ -592,6 +592,11 @@ "format": "uri", "title": "Website of the vendor" }, + "vendor_logo_url": { + "type": "string", + "format": "uri", + "title": "Link to the vendor logo (used by the GNS3 marketplace)" + }, "documentation_url": { "type": "string", "format": "uri", From c0b5f39c4c5b7911b3b558f0ec88b94fbf7ee353 Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 9 Oct 2023 16:54:47 +1000 Subject: [PATCH 06/11] Add Python 3.12 support. Fixes https://github.com/GNS3/gns3-server/issues/2273 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 82fe3b7a4..da8b2e99b 100644 --- a/setup.py +++ b/setup.py @@ -101,6 +101,7 @@ def run_tests(self): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", ], ) From 18950ca64fcdd734efaa4c3812ff76be2b9137f3 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 18 Oct 2023 13:24:45 +1000 Subject: [PATCH 07/11] Upgrade to PyQt5 v5.15.10 --- mac-requirements.txt | 2 +- win-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mac-requirements.txt b/mac-requirements.txt index c0f718542..def2481a2 100644 --- a/mac-requirements.txt +++ b/mac-requirements.txt @@ -1,3 +1,3 @@ -rrequirements.txt -PyQt5==5.15.9 +PyQt5==5.15.10 diff --git a/win-requirements.txt b/win-requirements.txt index 4af4a9fc5..1caf5da9c 100644 --- a/win-requirements.txt +++ b/win-requirements.txt @@ -1,4 +1,4 @@ -rrequirements.txt -PyQt5==5.15.9 # pyup: ignore +PyQt5==5.15.10 # pyup: ignore pywin32==306 # pyup: ignore From 607e20167468f80978485634b601cfe16af3a793 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 18 Oct 2023 14:29:53 +1000 Subject: [PATCH 08/11] Fix packaging issue on macOS --- mac-requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mac-requirements.txt b/mac-requirements.txt index def2481a2..5e6334e4b 100644 --- a/mac-requirements.txt +++ b/mac-requirements.txt @@ -1,3 +1,5 @@ -rrequirements.txt +PyQt5-Qt5==5.15.2 +PyQt5-sip==12.12.2 PyQt5==5.15.10 From f9d96051f57500286771fda1443f3d7143e27583 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 18 Oct 2023 14:33:27 +1000 Subject: [PATCH 09/11] Downgrade to PyQt5 v5.15.9 --- mac-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mac-requirements.txt b/mac-requirements.txt index 5e6334e4b..fa6d90645 100644 --- a/mac-requirements.txt +++ b/mac-requirements.txt @@ -2,4 +2,4 @@ PyQt5-Qt5==5.15.2 PyQt5-sip==12.12.2 -PyQt5==5.15.10 +PyQt5==5.15.9 From 841c29e6f650743d9cbcaa72d1f2e657de3dab79 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 18 Oct 2023 14:53:25 +1000 Subject: [PATCH 10/11] Upgrade sentry and psutil dependencies --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3455f852e..5f5f1e58a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ jsonschema>=4.17.3,<4.18; python_version >= '3.7' # v4.17.3 is the last version to support Python 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.31.0,<1.32 -psutil==5.9.5 +sentry-sdk==1.32.0,<1.33 +psutil==5.9.6 distro>=1.8.0 truststore>=0.8.0; python_version >= '3.10' importlib-resources>=1.3; python_version < '3.9' From ed88466d63b4889a2897c1d33dcfaaf1e66e8693 Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 23 Oct 2023 16:17:31 +1000 Subject: [PATCH 11/11] Upgrade to actions/checkout@v3 and actions/setup-python@v3 --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 156269fd9..27850fe26 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build and run Docker image run: | docker build -t gns3-gui-test .