Merge branch 'master' into 298-int

Conflicts:
	setup.py

1 files changed, 13 insertions, 4 deletions

diff --git a/setup.py b/setup.py
index 3b0ecdd8..003a0617 100644
--- a/setup.py
+++ b/setup.py
@@ -40,9 +40,10 @@ import sys
 try:
     from setuptools import setup
     kw = {
-        'install_requires': ['pycrypto >= 2.1, != 2.4',
-                             'ecdsa >= 0.11',
-                             ],
+        'install_requires': [
+            'pycrypto >= 2.1, != 2.4',
+            'ecdsa >= 0.11',
+        ],
     }
 except ImportError:
     from distutils.core import setup
@@ -53,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",
@@ -78,6 +86,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
     ],
     **kw
 )