Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sshuttle
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pub
sshuttle
Commits
9f27c194
Commit
9f27c194
authored
May 20, 2020
by
Brian May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated supported Python versions
* Drop 2.7 * Add 3.7 and 3.8
parent
6c21addd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
25 deletions
+12
-25
.travis.yml
.travis.yml
+4
-6
requirements.rst
docs/requirements.rst
+1
-9
run
run
+0
-2
setup.py
setup.py
+3
-1
tox.ini
tox.ini
+4
-7
No files found.
.travis.yml
View file @
9f27c194
...
...
@@ -2,16 +2,14 @@ language: python
matrix
:
include
:
-
python
:
2.7
env
:
TOXENV=py27
-
python
:
3.4
env
:
TOXENV=py34
-
python
:
3.5
env
:
TOXENV=py35
-
python
:
3.6
env
:
TOXENV=py36
-
python
:
pypy
env
:
TOXENV=pypy
-
python
:
3.7
env
:
TOXENV=py37
-
python
:
3.8
env
:
TOXENV=py38
install
:
-
pip install tox
...
...
docs/requirements.rst
View file @
9f27c194
...
...
@@ -6,7 +6,7 @@ Client side Requirements
- sudo, or root access on your client machine.
(The server doesn't need admin access.)
- Python
2.7 or Python 3.5
.
- Python
3.5 or greater
.
Linux with NAT method
...
...
@@ -32,14 +32,6 @@ Supports:
* IPv6 UDP (requires ``recvmsg`` - see below)
* IPv6 DNS (requires ``recvmsg`` - see below)
.. _PyXAPI: http://www.pps.univ-paris-diderot.fr/~ylg/PyXAPI/
Full UDP or DNS support with the TPROXY method requires the ``recvmsg()``
syscall. This is not available in Python 2, however it is in Python 3.5 and
later. Under Python 2 you might find it sufficient to install PyXAPI_ in
order to get the ``recvmsg()`` function. See :doc:`tproxy` for more
information.
MacOS / FreeBSD / OpenBSD / pfSense
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
run
View file @
9f27c194
...
...
@@ -7,8 +7,6 @@ python_best_version() {
if
[
-x
"
$(
command
-v
python3
)
"
]
&&
python3
-c
"import sys; sys.exit(not sys.version_info > (3, 5))"
;
then
exec
python3
"
$@
"
elif
[
-x
"
$(
command
-v
python2.7
)
"
]
;
then
exec
python2.7
"
$@
"
else
exec
python
"
$@
"
fi
...
...
setup.py
View file @
9f27c194
...
...
@@ -48,8 +48,10 @@ setup(
"License :: OSI Approved :: "
"GNU Lesser General Public License v2 or later (LGPLv2+)"
,
"Operating System :: OS Independent"
,
"Programming Language :: Python :: 2.7"
,
"Programming Language :: Python :: 3.5"
,
"Programming Language :: Python :: 3.6"
,
"Programming Language :: Python :: 3.7"
,
"Programming Language :: Python :: 3.8"
,
"Topic :: System :: Networking"
,
],
scripts
=
[
'bin/sudoers-add'
],
...
...
tox.ini
View file @
9f27c194
[tox]
downloadcache
=
{toxworkdir}/cache/
envlist
=
py27,
py34,
py35,
py36,
pypy,
py37,
py38,
[testenv]
basepython
=
py27:
python2.7
py34:
python3.4
py35:
python3.5
py36:
python3.6
pypy:
pypy
py37:
python3.7
py38:
python3.8
commands
=
pip
install
-e
.
# actual flake8 test
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment