Fixing development dependencies; fixing cryptography library issue; u…

…pdating readme
ktbyers · Jul 19, 2018 · cc4be98 · cc4be98
1 parent 7ded3a2
commit cc4be98
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,6 @@ Cisco IOS-XE
 Cisco IOS-XR  
 Cisco NX-OS  
 Cisco SG300  
-Dell OS10  
 HP Comware7  
 HP ProCurve  
 Juniper Junos  
@@ -36,12 +35,14 @@ Linux
 ###### Limited testing
 
 Alcatel AOS6/AOS8  
+Apresia Systems AEOS  
 Avaya ERS  
 Avaya VSP  
 Brocade VDX  
 Brocade MLX/NetIron  
 Calix B6  
 Cisco WLC  
+Dell OS10  
 Dell-Force10  
 Dell PowerConnect  
 Huawei  
@@ -63,7 +64,7 @@ Citrix Netscaler
 Cisco Telepresence  
 Check Point GAiA  
 Coriant  
-Dell Isilon  
+Dell EMC Isilon  
 Eltex  
 Enterasys  
 Extreme EXOS  
@@ -130,25 +131,6 @@ FastEthernet4              10.10.10.10     YES manual up                    up
 Vlan1                      unassigned      YES unset  down                  down    
 ```
 
-#### For long-running commands, use `send_command_expect()`
-
-`send_command_expect` waits for the trailing prompt (or for an optional pattern)
-```py
-net_connect.send_command_expect('write memory')
-```
-
-```
-Building configuration...
-[OK]
-```
-
-#### Enter and exit enable mode.
-
-```py
-net_connect.enable()
-net_connect.exit_enable_mode()
-```
-
 #### Execute configuration change commands (will automatically enter into config mode)
 
 ```py

diff --git a/netmiko/__init__.py b/netmiko/__init__.py
@@ -23,7 +23,7 @@
 NetmikoAuthError = NetMikoAuthenticationException
 Netmiko = ConnectHandler
 
-__version__ = '2.2.0'
+__version__ = '2.2.2'
 __all__ = ('ConnectHandler', 'ssh_dispatcher', 'platforms', 'SCPConn', 'FileTransfer',
            'NetMikoTimeoutException', 'NetMikoAuthenticationException',
            'NetmikoTimeoutError', 'NetmikoAuthError', 'InLineTransfer', 'redispatch',

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,6 @@
-pytest>=3.2.5
-pylama
-tox
+pytest==2.9.1
+pylama==7.4.3
+tox==2.5.0
+twine==1.11.0
 pysnmp
 -r requirements.txt
diff --git a/setup.py b/setup.py
@@ -2,6 +2,25 @@
 from setuptools import find_packages
 import os
 import re
+import sys
+
+
+requirements = [
+    'paramiko>=2.0.0',
+    'scp>=0.10.0',
+    'pyyaml',
+    'pyserial',
+    'textfsm',
+]
+
+# Cryptography library makes this necessary as older versions of PIP (PIP7 and less)
+# will not auto_install enum34 from extras_require.
+if sys.version_info < (3,):
+    requirements.append("enum34")
+    requirements.append("ipaddress")
+
+with open("README.md", "r") as fs:
+    long_description = fs.read()
 
 
 def find_version(*file_paths):
@@ -26,6 +45,8 @@ def find_version(*file_paths):
     name='netmiko',
     version=find_version('netmiko', '__init__.py'),
     description='Multi-vendor library to simplify Paramiko SSH connections to network devices',
+    long_description=long_description,
+    long_description_content_type="text/markdown",
     url='https://github.com/ktbyers/netmiko',
     author='Kirk Byers',
     author_email='ktbyers@twb-tech.com',
@@ -40,13 +61,7 @@ def find_version(*file_paths):
         'Programming Language :: Python :: 3.6',
     ],
     packages=find_packages(exclude=("test*", )),
-    install_requires=[
-        'paramiko>=2.0.0',
-        'scp>=0.10.0',
-        'pyyaml',
-        'pyserial',
-        'textfsm'
-    ],
+    install_requires=requirements,
     extras_require={
         'test': ['pytest>=3.2.5', ]
     },