From db739775d07eeabcad974d036156f708e0a678b6 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Mon, 14 Mar 2022 15:13:26 +1030
Subject: [PATCH] Drop Python 3.6 support and require Python >= 3.7

---
 .github/workflows/testing.yml |  2 +-
 gns3server/server.py          |  6 +++---
 requirements.txt              | 17 +++++------------
 setup.py                      |  6 +++---
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 10fb15d8a..1399dac6d 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/gns3server/server.py b/gns3server/server.py
index 9e7769f60..39c4e0953 100644
--- a/gns3server/server.py
+++ b/gns3server/server.py
@@ -268,9 +268,9 @@ class Server:
         else:
             log.info(f"Compute authentication is enabled with username '{config.Server.compute_username}'")
 
-        # we only support Python 3 version >= 3.6
-        if sys.version_info < (3, 6, 0):
-            raise SystemExit("Python 3.6 or higher is required")
+        # we only support Python 3 version >= 3.7
+        if sys.version_info < (3, 7, 0):
+            raise SystemExit("Python 3.7 or higher is required")
 
         log.info(
             "Running with Python {major}.{minor}.{micro} and has PID {pid}".format(
diff --git a/requirements.txt b/requirements.txt
index d75826b0f..7bc978047 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,9 @@
-uvicorn==0.17.6  ; python_version >= "3.7"
-uvicorn==0.16.0  ; python_version < "3.7"
+uvicorn==0.17.6
 fastapi==0.75.0
 python-multipart==0.0.5
-websockets==10.2  ; python_version >= "3.7"
-websockets==9.1  ; python_version < "3.7"
-aiohttp==3.8.1   ; python_version >= "3.7"
-aiohttp==3.7.4.post0  ; python_version < "3.7"
-async-timeout==4.0.2  ; python_version >= "3.7"
-async-timeout==3.0.1  ; python_version < "3.7"
+websockets==10.2
+aiohttp==3.8.1
+async-timeout==4.0.2
 aiofiles==0.8.0
 Jinja2==3.0.3
 sentry-sdk==1.5.7
@@ -19,7 +15,4 @@ aiosqlite===0.17.0
 passlib[bcrypt]==1.7.4
 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==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
+setuptools==60.6.0  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
diff --git a/setup.py b/setup.py
index 0ed75938f..3ae7938cc 100644
--- a/setup.py
+++ b/setup.py
@@ -23,9 +23,9 @@ import subprocess
 from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 
-# we only support Python 3 version >= 3.6
-if len(sys.argv) >= 2 and sys.argv[1] == "install" and sys.version_info < (3, 6, 0):
-    raise SystemExit("Python 3.6 or higher is required")
+# we only support Python 3 version >= 3.7
+if len(sys.argv) >= 2 and sys.argv[1] == "install" and sys.version_info < (3, 7, 0):
+    raise SystemExit("Python 3.7 or higher is required")
 
 
 class PyTest(TestCommand):