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
1e82571b
Commit
1e82571b
authored
Jan 13, 2016
by
Brian May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Experimental: Use setuptools-scm
Closes: #58
parent
aab973f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
.gitignore
.gitignore
+1
-0
setup.py
setup.py
+11
-3
__main__.py
sshuttle/__main__.py
+5
-0
No files found.
.gitignore
View file @
1e82571b
sshuttle/version.py
*.pyc
*~
*.8
...
...
setup.py
View file @
1e82571b
...
...
@@ -19,12 +19,20 @@
from
setuptools
import
setup
,
find_packages
with
open
(
'VERSION.txt'
,
'r'
)
as
f
:
version
=
f
.
readline
()
.
strip
()
def
version_scheme
(
version
):
from
setuptools_scm.version
import
guess_next_dev_version
version
=
guess_next_dev_version
(
version
)
return
version
.
lstrip
(
"v"
)
setup
(
name
=
"sshuttle"
,
version
=
version
,
use_scm_version
=
{
'write_to'
:
"sshuttle/version.py"
,
'version_scheme'
:
version_scheme
,
},
setup_requires
=
[
'setuptools_scm'
],
# version=version,
url
=
'https://github.com/sshuttle/sshuttle'
,
author
=
'Brian May'
,
author_email
=
'brian@linuxpenguins.xyz'
,
...
...
sshuttle/__main__.py
View file @
1e82571b
...
...
@@ -126,6 +126,7 @@ r,remote= ssh hostname (and optional username) of remote sshuttle server
x,exclude= exclude this subnet (can be used more than once)
X,exclude-from= exclude the subnets in a file (whitespace separated)
v,verbose increase debug message verbosity
V,version print the sshuttle version number and exit
e,ssh-cmd= the command to use to connect to the remote [ssh]
seed-hosts= with -H, use these hostnames for initial scan (comma-separated)
no-latency-control sacrifice latency to improve bandwidth benchmarks
...
...
@@ -142,6 +143,10 @@ hostwatch (internal use only)
o
=
options
.
Options
(
optspec
)
(
opt
,
flags
,
extra
)
=
o
.
parse
(
sys
.
argv
[
1
:])
if
opt
.
version
:
from
sshuttle.version
import
version
print
(
version
)
exit
(
0
)
if
opt
.
daemon
:
opt
.
syslog
=
1
if
opt
.
wrap
:
...
...
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