diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-09-15 10:57:59 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-09-15 10:57:59 -0700 |
| commit | f0415f0a94a623abac889931cf02e59ef66ff3d7 (patch) | |
| tree | 41ba3a65bfef229ee178585f9a07b0274bc77165 | |
| parent | 10eda0b1d44ef083f0151edf4fe17408babcb6d9 (diff) | |
| parent | efdcfd275f163a8d96253dbf6f036e3804e165db (diff) | |
Merge branch '1.16' into 1.17
| -rw-r--r-- | setup.py | 5 | ||||
| -rw-r--r-- | sites/www/installing.rst | 4 |
2 files changed, 2 insertions, 7 deletions
@@ -26,9 +26,8 @@ are supported. SFTP client and server mode are both supported too. Required packages: pyCrypto -To install the `in-development version -<https://github.com/paramiko/paramiko/tarball/master#egg=paramiko-dev>`_, use -`pip install paramiko==dev`. +To install the development version, ``pip install -e +git+https://github.com/paramiko/paramiko/#egg=paramiko``. ''' import sys diff --git a/sites/www/installing.rst b/sites/www/installing.rst index a657c3fc..3e96a50f 100644 --- a/sites/www/installing.rst +++ b/sites/www/installing.rst @@ -12,10 +12,6 @@ via `pip <http://pip-installer.org>`_:: $ pip install paramiko -.. note:: - Users who want the bleeding edge can install the development version via - ``pip install paramiko==dev``. - We currently support **Python 2.6, 2.7 and 3.3+** (Python **3.2** should also work but has a less-strong compatibility guarantee from us.) Users on Python 2.5 or older are urged to upgrade. |