Merge pull request #1584 from dvzrv/switch_to_prettytable

Replace the use of ptable with prettytable

Author: allmightyspiff

README.rst

@@ -167,7 +167,7 @@ If you cannot install python 3.6+ for some reason, you will need to use a versio
 
 Python Packages
 ---------------
-* ptable >= 0.9.2
+* prettytable >= 2.0.0
 * click >= 7
 * requests >= 2.20.0
 * prompt_toolkit >= 2

SoftLayer/CLI/formatting.py

@@ -11,11 +11,7 @@
 
 import click
 
-# If both PTable and prettytable are installed, its impossible to use the new version
-try:
-    from prettytable import prettytable
-except ImportError:
-    import prettytable
+import prettytable
 
 from SoftLayer.CLI import exceptions
 from SoftLayer import utils

setup.py

@@ -33,7 +33,7 @@
     },
     python_requires='>=3.5',
     install_requires=[
-        'ptable >= 0.9.2',
+        'prettytable >= 2.0.0',
         'click >= 7',
         'requests >= 2.20.0',
         'prompt_toolkit >= 2',

tools/requirements.txt

@@ -1,6 +1,6 @@
-ptable >= 0.9.2
+prettytable >= 2.0.0
 click >= 7
 requests >= 2.20.0
 prompt_toolkit >= 2
 pygments >= 2.0.0
-urllib3 >= 1.24
+urllib3 >= 1.24

tools/test-requirements.txt

@@ -4,9 +4,9 @@ pytest
 pytest-cov
 mock
 sphinx
-ptable >= 0.9.2
+prettytable >= 2.0.0
 click >= 7
 requests >= 2.20.0
 prompt_toolkit >= 2
 pygments >= 2.0.0
-urllib3 >= 1.24
+urllib3 >= 1.24