Merge branch '2.2' into 3.0

# Conflicts:
#	dev-requirements.txt
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/version.py
#	requirements.txt

CHANGELOG

@@ -1,5 +1,17 @@
 # Change Log
 
+## 2.2.31 26/02/2022
+
+* Install setuptools v59.6.0 when using Python 3.6
+
+## 2.2.30 25/02/2022
+
+* Support GNS3 variables in Docker environment variables. Fixes #2033
+* Release web UI 2.2.30
+* Set setuptools to v60.6.0
+* qemu_vm.py Linked node test.
+* Fix dead link in README.rst Fixes #2022
+
 ## 2.2.29 08/01/2022
 
 * Release web UI 2.2.29

README.rst

@@ -149,7 +149,7 @@ Windows
 -------
 
 
-Please use our `all-in-one installer <https://community.gns3.com/community/software/download>`_ to install the stable build.
+Please use our `all-in-one installer <https://community.gns3.com/software/download>`_ to install the stable build.
 
 If you install via source you need to first install:
 

dev-requirements.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
 
-pytest==6.2.5
+pytest==7.0.0
 flake8==4.0.1
 pytest-timeout==2.0.1
 pytest-asyncio==0.16.0

gns3server/compute/docker/docker_vm.py

@@ -446,6 +446,12 @@ class DockerVM(BaseNode):
                     continue
                 if not e.startswith("GNS3_"):
                     formatted = self._format_env(variables, e)
+                    vm_name = self._name.replace(",", ",,")
+                    project_path = self.project.path.replace(",", ",,")
+                    formatted = formatted.replace("%vm-name%", '"' + vm_name.replace('"', '\\"') + '"')
+                    formatted = formatted.replace("%vm-id%", self._id)
+                    formatted = formatted.replace("%project-id%", self.project.id)
+                    formatted = formatted.replace("%project-path%", '"' + project_path.replace('"', '\\"') + '"')
                     params["Env"].append(formatted)
 
         if self._console_type == "vnc":

gns3server/compute/qemu/qemu_vm.py

@@ -285,7 +285,7 @@ class QemuVM(BaseNode):
             for node in self.manager.nodes:
                 if node != self and getattr(node, variable) == value:
                     raise QemuError(
-                        f"Sorry a node without the linked base setting enabled can only be used once on your server. {value} is already used by {node.name}"
+                        f"Sorry a node without the linked base setting enabled can only be used once on your server. {value} is already used by {node.name} in project {node.project.name}"
                     )
         setattr(self, "_" + variable, value)
         log.info(

gns3server/crash_report.py

@@ -59,7 +59,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://8eb8a1f4730949f9886df2c6fdc27755:795f8ac399d04d24a273fcb35f48b725@o19455.ingest.sentry.io/38482"
+    DSN = "https://8f474628c1e44d0799140ccf05c486b8:f952ab1783d3427188fd81cc37da323c@o19455.ingest.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/static/web-ui/index.html

@@ -46,6 +46,6 @@
 
       gtag('config', 'G-5D6FZL9923');
     </script>
-  <script src="runtime.445d8d501d6ed9a85ab9.js" defer></script><script src="polyfills-es5.4eb1fdd946638b823036.js" nomodule defer></script><script src="polyfills.519e27ac94450b1b7e67.js" defer></script><script src="main.228427ce89197cdf9b3b.js" defer></script>
+  <script src="runtime.445d8d501d6ed9a85ab9.js" defer></script><script src="polyfills-es5.4eb1fdd946638b823036.js" nomodule defer></script><script src="polyfills.519e27ac94450b1b7e67.js" defer></script><script src="main.e8a548933524bbeda197.js" defer></script>
 
 </body></html>

requirements.txt

@@ -20,4 +20,5 @@ python-jose==3.3.0
 email-validator==1.1.3
 async-exit-stack==1.0.1  ; python_version < "3.7"
 async-generator==1.10  ; python_version < "3.7"
-setuptools
+setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6

win-requirements.txt

@@ -1,4 +1,4 @@
 -r requirements.txt
 
-pywin32==301
+pywin32==303
 wmi==1.5.1