summaryrefslogtreecommitdiffhomepage
path: root/setup.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-05 13:23:02 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-05 13:23:02 -0700
commit0e784d81131a369da88051e4c12dd6e4b5e3c8b1 (patch)
tree4bec5f731196ced01797d11548dde6ca84f22c9e /setup.py
parentf258d1e207a21d4342dbc431fcc4a4dafe893e80 (diff)
parent720806734a05d9de0f47588d816de05646a06f0b (diff)
Merge branch 'master' into 184-int
Conflicts: paramiko/config.py tests/test_util.py
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 4a858326..13386c8e 100644
--- a/setup.py
+++ b/setup.py
@@ -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.13.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
)