mirror of
https://github.com/sshuttle/sshuttle.git
synced 2024-11-21 23:43:18 +01:00
Updated supported Python versions
* Drop 2.7 * Add 3.7 and 3.8
This commit is contained in:
parent
6c21addde9
commit
9f27c1943b
10
.travis.yml
10
.travis.yml
@ -2,16 +2,14 @@ language: python
|
|||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- python: 2.7
|
|
||||||
env: TOXENV=py27
|
|
||||||
- python: 3.4
|
|
||||||
env: TOXENV=py34
|
|
||||||
- python: 3.5
|
- python: 3.5
|
||||||
env: TOXENV=py35
|
env: TOXENV=py35
|
||||||
- python: 3.6
|
- python: 3.6
|
||||||
env: TOXENV=py36
|
env: TOXENV=py36
|
||||||
- python: pypy
|
- python: 3.7
|
||||||
env: TOXENV=pypy
|
env: TOXENV=py37
|
||||||
|
- python: 3.8
|
||||||
|
env: TOXENV=py38
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- pip install tox
|
- pip install tox
|
||||||
|
@ -6,7 +6,7 @@ Client side Requirements
|
|||||||
|
|
||||||
- sudo, or root access on your client machine.
|
- sudo, or root access on your client machine.
|
||||||
(The server doesn't need admin access.)
|
(The server doesn't need admin access.)
|
||||||
- Python 2.7 or Python 3.5.
|
- Python 3.5 or greater.
|
||||||
|
|
||||||
|
|
||||||
Linux with NAT method
|
Linux with NAT method
|
||||||
@ -32,14 +32,6 @@ Supports:
|
|||||||
* IPv6 UDP (requires ``recvmsg`` - see below)
|
* IPv6 UDP (requires ``recvmsg`` - see below)
|
||||||
* IPv6 DNS (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
|
MacOS / FreeBSD / OpenBSD / pfSense
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
2
run
2
run
@ -7,8 +7,6 @@ python_best_version() {
|
|||||||
if [ -x "$(command -v python3)" ] &&
|
if [ -x "$(command -v python3)" ] &&
|
||||||
python3 -c "import sys; sys.exit(not sys.version_info > (3, 5))"; then
|
python3 -c "import sys; sys.exit(not sys.version_info > (3, 5))"; then
|
||||||
exec python3 "$@"
|
exec python3 "$@"
|
||||||
elif [ -x "$(command -v python2.7)" ]; then
|
|
||||||
exec python2.7 "$@"
|
|
||||||
else
|
else
|
||||||
exec python "$@"
|
exec python "$@"
|
||||||
fi
|
fi
|
||||||
|
4
setup.py
4
setup.py
@ -48,8 +48,10 @@ setup(
|
|||||||
"License :: OSI Approved :: "
|
"License :: OSI Approved :: "
|
||||||
"GNU Lesser General Public License v2 or later (LGPLv2+)",
|
"GNU Lesser General Public License v2 or later (LGPLv2+)",
|
||||||
"Operating System :: OS Independent",
|
"Operating System :: OS Independent",
|
||||||
"Programming Language :: Python :: 2.7",
|
|
||||||
"Programming Language :: Python :: 3.5",
|
"Programming Language :: Python :: 3.5",
|
||||||
|
"Programming Language :: Python :: 3.6",
|
||||||
|
"Programming Language :: Python :: 3.7",
|
||||||
|
"Programming Language :: Python :: 3.8",
|
||||||
"Topic :: System :: Networking",
|
"Topic :: System :: Networking",
|
||||||
],
|
],
|
||||||
scripts=['bin/sudoers-add'],
|
scripts=['bin/sudoers-add'],
|
||||||
|
11
tox.ini
11
tox.ini
@ -1,19 +1,16 @@
|
|||||||
[tox]
|
[tox]
|
||||||
downloadcache = {toxworkdir}/cache/
|
downloadcache = {toxworkdir}/cache/
|
||||||
envlist =
|
envlist =
|
||||||
py27,
|
|
||||||
py34,
|
|
||||||
py35,
|
py35,
|
||||||
py36,
|
py36,
|
||||||
pypy,
|
py37,
|
||||||
|
py38,
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython =
|
basepython =
|
||||||
py27: python2.7
|
|
||||||
py34: python3.4
|
|
||||||
py35: python3.5
|
|
||||||
py36: python3.6
|
py36: python3.6
|
||||||
pypy: pypy
|
py37: python3.7
|
||||||
|
py38: python3.8
|
||||||
commands =
|
commands =
|
||||||
pip install -e .
|
pip install -e .
|
||||||
# actual flake8 test
|
# actual flake8 test
|
||||||
|
Loading…
Reference in New Issue
Block a user