[project @ robey@lag.net-20051216175905-c3477e2ec74db4d9]

add setuptools/easy_setup support

2 files changed, 25 insertions, 3 deletions

diff --git a/README b/README
index 45997acc..280a7ade 100644
--- a/README
+++ b/README
@@ -38,6 +38,10 @@ you can also build it yourself using the free MinGW tools and this command
 line (thanks to Roger Binns for the info):
     python setup.py build --compiler=mingw32 bdist_wininst
 
+If you have setuptools, you can build and install paramiko and all its
+dependencies with this command (as root):
+    easy_install ./
+
 
 ***  PORTABILITY
 
@@ -246,3 +250,8 @@ v1.0 JIGGLYPUFF
 * make a function to parse .ssh/config files:
 	User, Hostname, Port, ProxyCommand, IdentityFile, HostKeyAlias
 	ProxyCommand: %h = host, %p = port, "none" = disable
+* introduce higher-level abstraction (SSHConnection ?) that handles host key
+  checking, etc, using openssh defaults or optional configuration (2ndary host
+  key files, etc)
+    local and remote port forwarding
+* SFTPClient.set_size
diff --git a/setup.py b/setup.py
index ce7d0479..1a2fe707 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,3 @@
-from distutils.core import setup
-
 # Copyright (C) 2003-2005 Robey Pointer <robey@lag.net>
 #
 # This file is part of paramiko.
@@ -26,9 +24,23 @@ connections between python scripts.  All major ciphers and hash methods
 are supported.  SFTP client and server mode are both supported too.
 
 Required packages:
-    pyCrypt
+    pyCrypto
 '''
 
+# if someday we want to *require* setuptools, uncomment this:
+# (it will cause setuptools to be automatically downloaded)
+#import ez_setup
+#ez_setup.use_setuptools()
+
+try:
+    from setuptools import setup
+    kw = {
+        'install_requires': 'pycrypto >= 1.9',
+    }
+except ImportError:
+    from distutils.core import setup
+    kw = {}
+
 setup(name = "paramiko",
       version = "1.5.2",
       description = "SSH2 protocol library",
@@ -46,4 +58,5 @@ setup(name = "paramiko",
                       'Topic :: Internet',
                       'Topic :: Security :: Cryptography' ],
       long_description = longdesc,
+      **kw
       )