summaryrefslogtreecommitdiffhomepage
path: root/README
diff options
context:
space:
mode:
authorScott Maxwell <scott@codecobblers.com>2014-01-16 19:50:53 -0800
committerScott Maxwell <scott@codecobblers.com>2014-01-16 19:50:53 -0800
commitb9e62182e55e3f0a6e8207f7fcc2244a61132968 (patch)
tree714c502731de8d17370942d2c1b2bb0bb04cf6ab /README
parentaa8ea3c4d42d508a722fdf4ea635ff5e609cca1b (diff)
parenta08ac06083a40eb1455e5fa14cd644f7a2350f16 (diff)
Merge remote-tracking branch 'master/master' into py3-support-without-py25
Conflicts: paramiko/__init__.py setup.py tests/test_client.py
Diffstat (limited to 'README')
-rw-r--r--README3
1 files changed, 2 insertions, 1 deletions
diff --git a/README b/README
index ae50a80f..666b31a7 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ paramiko
:Paramiko: Python SSH module
:Copyright: Copyright (c) 2003-2009 Robey Pointer <robeypointer@gmail.com>
-:Copyright: Copyright (c) 2013 Jeff Forcier <jeff@bitprophet.org>
+:Copyright: Copyright (c) 2014 Jeff Forcier <jeff@bitprophet.org>
:License: LGPL
:Homepage: https://github.com/paramiko/paramiko/
:API docs: http://docs.paramiko.org
@@ -36,6 +36,7 @@ Requirements
- python 2.6 or better <http://www.python.org/>
- pycrypto 2.1 or better <https://www.dlitz.net/software/pycrypto/>
+ - ecdsa 0.9 or better <https://pypi.python.org/pypi/ecdsa>
If you have setuptools, you can build and install paramiko and all its
dependencies with this command (as root)::