[PR PATCH] GNS3 2.2.35 - new version supports Python 3.11

[PR PATCH] GNS3 2.2.35 - new version supports Python 3.11

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

There is a new pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3-2.2.35
https://github.com/void-linux/void-packages/pull/40400

GNS3 2.2.35 - new version supports Python 3.11
Python 3.11 support was added to GNS3 2.2.35.
A new required library was added to 2.2.35 so a new Void package was created.

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)

For reference, `gns3` 2.2.34 fails 

A patch file from https://github.com/void-linux/void-packages/pull/40400.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3-2.2.35-40400.patch --]
[-- Type: text/x-diff, Size: 4093 bytes --]

From 24022bf779105a60f391ce595730f39874090047 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 8 Nov 2022 19:00:18 -0600
Subject: [PATCH 1/3] gns3-gui: update to 2.2.35.

---
 srcpkgs/gns3-gui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 5b83f9314837..8a08c6d34214 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.34
-revision=2
+version=2.2.35
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=bf66313a4808fdb1cd9b06c72d34fd9fc4bcf5abe990dfd8de70d8128a2c26dc
+checksum=5dee30a6be10a4463d16c3cec516bf81717fc6f37f4f53386347d98de9a1f43b
 
 
 post_patch() {

From 354194e5f422fcc218c8f434cf19008a4b4c0287 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 8 Nov 2022 19:00:23 -0600
Subject: [PATCH 2/3] gns3-server: update to 2.2.35.

---
 srcpkgs/gns3-server/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index c795b151432d..7bb29035ffe9 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,12 +1,12 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.34
-revision=2
+version=2.2.35
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors
  python3-yarl python3-Jinja2 python3-psutil python3-aiofiles
- python3-py-cpuinfo python3-distro python3-async-timeout dynamips"
+ python3-py-cpuinfo python3-distro python3-async-timeout dynamips python3-importlib_resources"
 checkdepends="${depends} python3-pytest python3-flake8 python3-pytest-timeout python3-pytest-aiohttp"
 short_desc="Graphical Network Simulator 3 - Server"
 maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=8bd61a0777df7cf195b2670ab81139f3029d9b33cf329cfa612d2b2ea3def947
+checksum=2c20ddc968a24fd8a77c272071d35304bac0706266a3f9e643658555e634c489
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From bfd68ac54cc35cb514ca76223c194a9f748af246 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 8 Nov 2022 19:00:35 -0600
Subject: [PATCH 3/3] New package: python3-importlib_resources-5.10.0

---
 srcpkgs/python3-importlib_resources/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-importlib_resources/template

diff --git a/srcpkgs/python3-importlib_resources/template b/srcpkgs/python3-importlib_resources/template
new file mode 100644
index 000000000000..af52874205ed
--- /dev/null
+++ b/srcpkgs/python3-importlib_resources/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-importlib_resources'
+pkgname=python3-importlib_resources
+version=5.10.0
+revision=1
+wrksrc="importlib_resources-${version}"
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
+short_desc="Backport of Python standard library importlib.resources module"
+maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/python/importlib_resources"
+distfiles="${PYPI_SITE}/i/importlib_resources/importlib_resources-${version}.tar.gz"
+checksum=c01b1b94210d9849f286b86bb51bcea7cd56dde0600d8db721d7b81330711668

Re: GNS3 2.2.35 - new version supports Python 3.11

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40400#issuecomment-1308084176

Comment:
is this using parts of importlib_resources that are not already part of py3.11? that package is made for backporting/feature preview for the stdlib module

Re: GNS3 2.2.35 - new version supports Python 3.11

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 638 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40400#issuecomment-1308095539

Comment:
yeah it looks like they didn't consider newer python versions for this. could totally patch out the dependency with

requirements.txt:
```diff
- importlib-resources>=1.3
+ importlib-resources>=1.3; python_version < '3.9'
```
all the places they use the library (see https://github.com/GNS3/gns3-server/pull/2133):
```diff
- import importlib_resources
+ try:
+     from importlib import resources as importlib_resources
+ except ImportError:
+     import importlib_resources
```

Re: GNS3 2.2.35 - new version supports Python 3.11

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/40400#issuecomment-1308106201

Comment:
Yes.  I'm working on the patch now.  I noticed the backport description in the importlib_resources repo but didn't take the time to see how it would work without it.  Using `importlib.resources` seems to work fine.

Re: [PR PATCH] [Updated] GNS3 2.2.35 - new version supports Python 3.11

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages gns3-2.2.35
https://github.com/void-linux/void-packages/pull/40400

GNS3 2.2.35 - new version supports Python 3.11
Python 3.11 support was added to GNS3 2.2.35.
A new required library was added to 2.2.35 so a new Void package was created.

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)

For reference, `gns3` 2.2.34 fails 

A patch file from https://github.com/void-linux/void-packages/pull/40400.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gns3-2.2.35-40400.patch --]
[-- Type: text/x-diff, Size: 4837 bytes --]

From 24022bf779105a60f391ce595730f39874090047 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 8 Nov 2022 19:00:18 -0600
Subject: [PATCH 1/2] gns3-gui: update to 2.2.35.

---
 srcpkgs/gns3-gui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 5b83f9314837..8a08c6d34214 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.34
-revision=2
+version=2.2.35
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=bf66313a4808fdb1cd9b06c72d34fd9fc4bcf5abe990dfd8de70d8128a2c26dc
+checksum=5dee30a6be10a4463d16c3cec516bf81717fc6f37f4f53386347d98de9a1f43b
 
 
 post_patch() {

From 52164192ac654c4ee3590550bf7be7dc03b9c036 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 8 Nov 2022 19:00:23 -0600
Subject: [PATCH 2/2] gns3-server: update to 2.2.35.

---
 srcpkgs/gns3-server/patches/importlib.patch | 65 +++++++++++++++++++++
 srcpkgs/gns3-server/template                |  6 +-
 2 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gns3-server/patches/importlib.patch

diff --git a/srcpkgs/gns3-server/patches/importlib.patch b/srcpkgs/gns3-server/patches/importlib.patch
new file mode 100644
index 000000000000..c3dbd98bc766
--- /dev/null
+++ b/srcpkgs/gns3-server/patches/importlib.patch
@@ -0,0 +1,65 @@
+diff --git a/gns3server/controller/__init__.py b/gns3server/controller/__init__.py
+index 5c5236b9..971e3452 100644
+--- a/gns3server/controller/__init__.py
++++ b/gns3server/controller/__init__.py
+@@ -22,7 +22,11 @@ import uuid
+ import socket
+ import shutil
+ import aiohttp
+-import importlib_resources
++
++try:
++    from importlib import resources as importlib_resources
++except ImportError:
++    import importlib_resources
+ 
+ from ..config import Config
+ from .project import Project
+diff --git a/gns3server/controller/appliance_manager.py b/gns3server/controller/appliance_manager.py
+index d15fc69b..41b73104 100644
+--- a/gns3server/controller/appliance_manager.py
++++ b/gns3server/controller/appliance_manager.py
+@@ -21,9 +21,13 @@ import json
+ import uuid
+ import asyncio
+ import aiohttp
+-import importlib_resources
+ import shutil
+ 
++try:
++    from importlib import resources as importlib_resources
++except ImportError:
++    import importlib_resources
++
+ from .appliance import Appliance
+ from ..config import Config
+ from ..utils.asyncio import locking
+diff --git a/gns3server/utils/get_resource.py b/gns3server/utils/get_resource.py
+index b4b599bd..f4054cd3 100644
+--- a/gns3server/utils/get_resource.py
++++ b/gns3server/utils/get_resource.py
+@@ -19,7 +19,11 @@ import atexit
+ import logging
+ import os
+ import sys
+-import importlib_resources
++
++try:
++    from importlib import resources as importlib_resources
++except ImportError:
++    import importlib_resources
+ 
+ from contextlib import ExitStack
+ resource_manager = ExitStack()
+diff --git a/requirements.txt b/requirements.txt
+index 53f1200d..5eda661b 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -11,6 +11,6 @@ psutil==5.9.2
+ async-timeout>=4.0.2,<4.1
+ distro>=1.7.0
+ py-cpuinfo>=9.0.0,<10.0
+-importlib-resources>=1.3
++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
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index c795b151432d..e1b3c68ca2cd 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.34
-revision=2
+version=2.2.35
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=8bd61a0777df7cf195b2670ab81139f3029d9b33cf329cfa612d2b2ea3def947
+checksum=2c20ddc968a24fd8a77c272071d35304bac0706266a3f9e643658555e634c489
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

Re: GNS3 2.2.35 - new version supports Python 3.11

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/40400#issuecomment-1308119049

Comment:
@classabbyamp I started working on a naive patch before I saw your solution.  I like yours better.  I wrote up a patch with your code.

Re: GNS3 2.2.35 - new version supports Python 3.11

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/40400#issuecomment-1308119049

Comment:
@classabbyamp I started working on a naive patch before I saw your solution.  I like yours better.  I wrote up a patch with your code.

Also, thanks for commenting on the upstream PR that brought in `importlib_resources`.

Re: [PR PATCH] [Merged]: GNS3 2.2.35 - new version supports Python 3.11

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 699 bytes --]

There's a merged pull request on the void-packages repository

GNS3 2.2.35 - new version supports Python 3.11
https://github.com/void-linux/void-packages/pull/40400

Description:
Python 3.11 support was added to GNS3 2.2.35.
A new required library was added to 2.2.35 so a new Void package was created.

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)

For reference, `gns3` 2.2.34 fails