From ccb5de6df18e3c05f7daee5e37c365eaeb3ba1b8 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Thu, 9 May 2024 18:23:58 +0700
Subject: [PATCH 1/4] Drop Python 3.7

---
 .github/workflows/testing.yml | 2 +-
 gns3server/run.py             | 6 +++---
 requirements.txt              | 3 +--
 setup.py                      | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index e75eb4c24..a0c06f89b 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/gns3server/run.py b/gns3server/run.py
index c15d976ef..32467d45a 100644
--- a/gns3server/run.py
+++ b/gns3server/run.py
@@ -235,9 +235,9 @@ def run():
             return
         log.info("HTTP authentication is enabled with username '{}'".format(user))
 
-    # we only support Python 3 version >= 3.7
-    if sys.version_info < (3, 7, 0):
-        raise SystemExit("Python 3.7 or higher is required")
+    # we only support Python 3 version >= 3.8
+    if sys.version_info < (3, 8, 0):
+        raise SystemExit("Python 3.8 or higher is required")
 
     user_log.info("Running with Python {major}.{minor}.{micro} and has PID {pid}".format(major=sys.version_info[0], minor=sys.version_info[1],
                                                                                          micro=sys.version_info[2], pid=os.getpid()))
diff --git a/requirements.txt b/requirements.txt
index eea991fd1..175a40a1e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
 jsonschema>=4.17.3,<4.18  # v4.17.3 is the last version to support Python 3.7
-aiohttp>=3.8.6,<3.9; python_version == '3.7'   # v3.8.6 is the last version to support Python 3.7
-aiohttp>=3.9.3,<3.10; python_version > '3.7'
+aiohttp>=3.9.3,<3.10
 aiohttp-cors>=0.7.0,<0.8
 aiofiles>=23.2.1,<23.3
 Jinja2>=3.1.4,<3.2
diff --git a/setup.py b/setup.py
index 167d64d02..b35ad99e2 100644
--- a/setup.py
+++ b/setup.py
@@ -81,7 +81,6 @@ def run_tests(self):
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

From 535ea0ad9f29fd685a45e77177fa7c15fafc8daf Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Thu, 9 May 2024 18:37:40 +0700
Subject: [PATCH 2/4] Upgrade jsonschema and aiohttp

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 175a40a1e..0b64186bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-jsonschema>=4.17.3,<4.18  # v4.17.3 is the last version to support Python 3.7
-aiohttp>=3.9.3,<3.10
+jsonschema>=4.22.0,<4.23
+aiohttp>=3.9.4,<3.10
 aiohttp-cors>=0.7.0,<0.8
 aiofiles>=23.2.1,<23.3
 Jinja2>=3.1.4,<3.2

From d01129a3cfeb5bdcc4a2c78551b1c6b7ea74ee85 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Thu, 9 May 2024 18:58:37 +0700
Subject: [PATCH 3/4] Upgrade aiohttp, sentry-sdk and truststore

---
 requirements.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0b64186bf..8fa1f7f5b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,13 @@
 jsonschema>=4.22.0,<4.23
-aiohttp>=3.9.4,<3.10
+aiohttp>=3.9.5,<3.10
 aiohttp-cors>=0.7.0,<0.8
 aiofiles>=23.2.1,<23.3
 Jinja2>=3.1.4,<3.2
-sentry-sdk==1.40.6,<1.41
+sentry-sdk==2.2.1,<2.3
 psutil==5.9.8
 async-timeout>=4.0.3,<4.1
 distro>=1.9.0
 py-cpuinfo>=9.0.0,<10.0
 platformdirs>=2.4.0
 importlib-resources>=1.3; python_version < '3.9'
-truststore>=0.8.0; python_version >= '3.10'
-setuptools>=60.8.1
+truststore>=0.9.1; python_version >= '3.10'

From 388ffe9f00cf8fa4f37ad20401c220c18e8cdf76 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Thu, 9 May 2024 19:03:08 +0700
Subject: [PATCH 4/4] Change sentry-sdk version

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 8fa1f7f5b..605ce3c2d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ aiohttp>=3.9.5,<3.10
 aiohttp-cors>=0.7.0,<0.8
 aiofiles>=23.2.1,<23.3
 Jinja2>=3.1.4,<3.2
-sentry-sdk==2.2.1,<2.3
+sentry-sdk==2.1.1,<2.2
 psutil==5.9.8
 async-timeout>=4.0.3,<4.1
 distro>=1.9.0