From 6d36916f48ae69abe175682f111f505923aba339 Mon Sep 17 00:00:00 2001
From: Brian May <brian@linuxpenguins.xyz>
Date: Tue, 29 Mar 2022 11:44:35 +1100
Subject: [PATCH] Remove support for Python 3.6 and 3.7

Fixes #716
---
 .github/workflows/pythonpackage.yml | 2 +-
 docs/requirements.rst               | 4 ++--
 setup.py                            | 5 ++---
 tox.ini                             | 6 ++----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index c4e9ab4..8b05efb 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.8, 3.9, "3.10"]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/docs/requirements.rst b/docs/requirements.rst
index 821d52f..9a2e186 100644
--- a/docs/requirements.rst
+++ b/docs/requirements.rst
@@ -6,7 +6,7 @@ Client side Requirements
 
 - sudo, or root access on your client machine.
   (The server doesn't need admin access.)
-- Python 3.6 or greater.
+- Python 3.8 or greater.
 
 
 Linux with NAT method
@@ -72,7 +72,7 @@ cmd.exe with Administrator access. See :doc:`windows` for more information.
 Server side Requirements
 ------------------------
 
-- Python 3.6 or greater.
+- Python 3.8 or greater.
 
 
 Additional Suggested Software
diff --git a/setup.py b/setup.py
index df3032f..74c9238 100755
--- a/setup.py
+++ b/setup.py
@@ -49,10 +49,9 @@ setup(
         "License :: OSI Approved :: "
             "GNU Lesser General Public License v2 or later (LGPLv2+)",
         "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Topic :: System :: Networking",
     ],
     entry_points={
@@ -60,7 +59,7 @@ setup(
             'sshuttle = sshuttle.cmdline:main',
         ],
     },
-    python_requires='>=3.6',
+    python_requires='>=3.8',
     install_requires=[
     ],
     tests_require=[
diff --git a/tox.ini b/tox.ini
index 84ed81d..b63d87c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,15 @@
 [tox]
 downloadcache = {toxworkdir}/cache/
 envlist =
-    py36,
-    py37,
     py38,
     py39,
+    py310,
 
 [testenv]
 basepython =
-    py36: python3.6
-    py37: python3.7
     py38: python3.8
     py39: python3.9
+    py310: python3.10
 commands =
     pip install -e .
     # actual flake8 test