Skip to content

Commit 91b7264

Browse files
author
Pan
committed
Updated documentation, requirements, setup.py
1 parent c7751c1 commit 91b7264

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

doc/ssh2.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,17 @@ Feature paramiko ssh2-python (libssh2)
1111
Agent forwarding Yes Not supported
1212
Proxying/tunnelling Yes Not yet implemented
1313
Kerberos (GSS) authentication Yes Not supported
14-
Per-channel timeout setting Yes Not supported
15-
Public key from memory Yes Not yet implemented
16-
SFTP copy to/from hosts Yes Yes
17-
Agent authentication Yes Yes
1814
Private key file authentication Yes Yes
15+
Private key from memory Yes Not yet implemented
16+
Agent authentication Yes Yes
1917
Password authentication Yes Yes
18+
SFTP copy to/from hosts Yes Yes
2019
Session timeout setting Yes Yes
2120
Per-channel timeout setting Yes Not supported
2221
Programmatic SSH agent Yes Not supported
2322
OpenSSH config parsing Yes Not yet implemented
2423
=============================== ========= ======================
2524

26-
If any of missing features are required for a use case, then the paramiko based clients should be used instead. In all other cases the ``ssh2-python`` based clients offer significantly greater performance at less overhead and are preferred.
25+
If any of missing features are required for a use case, then the paramiko based clients should be used instead.
26+
27+
In all other cases the ``ssh2-python`` based clients offer significantly greater performance at less overhead and are preferred.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
paramiko>=1.15.3,<2.2
22
gevent
3-
ssh2-python
3+
ssh2-python>=0.6.0

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
'tests', 'tests.*',
7171
'*.tests', '*.tests.*')
7272
),
73-
install_requires=['paramiko<2.2', gevent_req],
73+
install_requires=['paramiko<2.2', gevent_req, 'ssh2-python>=0.6.0'],
7474
classifiers=[
7575
'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)',
7676
'Intended Audience :: Developers',

0 commit comments

Comments
 (0)