Flip import, setup.py, version command back to Paramiko

fabric · Sep 26, 2012 · dd781e8 · dd781e8
1 parent d15f030
commit dd781e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/fabric/main.py b/fabric/main.py
@@ -615,7 +615,7 @@ def main():
         # Handle version number option
         if options.show_version:
             print("Fabric %s" % state.env.version)
-            print("ssh (library) %s" % ssh.__version__)
+            print("Paramiko %s" % ssh.__version__)
             sys.exit(0)
 
         # Load settings from user settings file, into shared env dict.

diff --git a/fabric/network.py b/fabric/network.py
@@ -19,7 +19,7 @@
 try:
     import warnings
     warnings.simplefilter('ignore', DeprecationWarning)
-    import ssh
+    import paramiko as ssh
 except ImportError, e:
     import traceback
     traceback.print_exc()

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
     packages=find_packages(),
     test_suite='nose.collector',
     tests_require=['nose', 'fudge<1.0'],
-    install_requires=['ssh>=1.7.14'],
+    install_requires=['paramiko>=1.8.0'],
     entry_points={
         'console_scripts': [
             'fab = fabric.main:main',