From 4a65f97c8bafbd08b1cf7be1764b3b5212a4d192 Mon Sep 17 00:00:00 2001 From: Brian May Date: Wed, 16 Dec 2020 20:11:13 +1100 Subject: [PATCH] Drop testing of Python 3.5 Due to message from CI: DEPRECATION: Python 3.5 reached the end of its life on September 13th, 2020. Please upgrade your Python as Python 3.5 is no longer maintained. pip 21.0 will drop support for Python 3.5 in January 2021. pip 21.0 will remove support for this functionality. --- .github/workflows/pythonpackage.yml | 2 +- docs/manpage.rst | 2 +- docs/requirements.rst | 4 ++-- setup.py | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 5aca725..fc178c6 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.5, 3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8] steps: - uses: actions/checkout@v2 diff --git a/docs/manpage.rst b/docs/manpage.rst index b5adfb6..3ee5e10 100644 --- a/docs/manpage.rst +++ b/docs/manpage.rst @@ -11,7 +11,7 @@ Description ----------- :program:`sshuttle` allows you to create a VPN connection from your machine to any remote server that you can connect to via -ssh, as long as that server has python 3.5 or higher. +ssh, as long as that server has python 3.6 or higher. To work, you must have root access on the local machine, but you can have a normal account on the server. diff --git a/docs/requirements.rst b/docs/requirements.rst index 335b3c4..f4499ea 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.5 or greater. +- Python 3.6 or greater. Linux with NAT method @@ -70,7 +70,7 @@ cmd.exe with Administrator access. See :doc:`windows` for more information. Server side Requirements ------------------------ -- Python 3.5 or greater. +- Python 3.6 or greater. Additional Suggested Software diff --git a/setup.py b/setup.py index 705a6b6..2ea100d 100755 --- a/setup.py +++ b/setup.py @@ -49,7 +49,6 @@ setup( "License :: OSI Approved :: " "GNU Lesser General Public License v2 or later (LGPLv2+)", "Operating System :: OS Independent", - "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", @@ -61,7 +60,7 @@ setup( 'sshuttle = sshuttle.cmdline:main', ], }, - python_requires='>=3.5', + python_requires='>=3.6', install_requires=[ 'psutil', ],