Merge pull request #1065 from allmightyspiff/1064

updating requests and urllib3 to address CVE-2018-18074

Author: allmightyspiff

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='SoftLayer',
-    version='5.6.0',
+    version='5.6.1',
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     author='SoftLayer Technologies, Inc.',
@@ -33,12 +33,12 @@
         'six >= 1.7.0',
         'ptable >= 0.9.2',
         'click >= 7',
-        'requests == 2.19.1',
+        'requests >= 2.20.0',
         'prompt_toolkit >= 0.53',
         'pygments >= 2.0.0',
-        'urllib3 == 1.22'
+        'urllib3 >= 1.24'
     ],
-    keywords=['softlayer', 'cloud'],
+    keywords=['softlayer', 'cloud', 'slcli'],
     classifiers=[
         'Environment :: Console',
         'Environment :: Web Environment',

tools/requirements.txt

@@ -1,6 +1,7 @@
-requests == 2.19.1
-click >= 5, < 7
-prettytable >= 0.7.0
 six >= 1.7.0
-prompt_toolkit
-urllib3 == 1.22
+ptable >= 0.9.2
+click >= 7
+requests >= 2.20.0
+prompt_toolkit >= 0.53
+pygments >= 2.0.0
+urllib3 >= 1.24

tools/test-requirements.txt

@@ -4,5 +4,10 @@ pytest-cov
 mock
 sphinx
 testtools
-urllib3 == 1.22
-requests == 2.19.1
+six >= 1.7.0
+ptable >= 0.9.2
+click >= 7
+requests >= 2.20.0
+prompt_toolkit >= 0.53
+pygments >= 2.0.0
+urllib3 >= 1.24