diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 14:26:52 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 14:27:21 -0700 |
commit | 8b0e10df60bb8e3fac8f81959d7f3f39a8d0e000 (patch) | |
tree | 4e0766b74d7688624f21766f2be0ff5d8e9cfae1 /setup.py | |
parent | b0ffd7c9c8d0941ee95e6f133cb6697bfb6a9b99 (diff) | |
parent | 24e022bdf656f272b4dafb76df1a7739965be2f9 (diff) |
Merge branch 'master' into 372-int
Conflicts:
paramiko/channel.py
tests/test_util.py
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -42,7 +42,7 @@ try: kw = { 'install_requires': [ 'pycrypto >= 2.1, != 2.4', - 'ecdsa', + 'ecdsa >= 0.11', ], } except ImportError: @@ -54,9 +54,16 @@ if sys.platform == 'darwin': setup_helper.install_custom_make_tarball() +# Version info -- read without importing +_locals = {} +with open('paramiko/_version.py') as fp: + exec(fp.read(), None, _locals) +version = _locals['__version__'] + + setup( name = "paramiko", - version = "1.14.0", + version = version, description = "SSH2 protocol library", long_description = longdesc, author = "Jeff Forcier", @@ -79,6 +86,7 @@ setup( 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', ], **kw ) |