From c6d2a9d3b08b0eca21c2b7aad91ce7f1e0faf8d7 Mon Sep 17 00:00:00 2001
From: Steve Jones <steve.jones@appscale.com>
Date: Tue, 24 Sep 2019 11:11:50 -0700
Subject: [PATCH] Setup cleanup post separation from tools

---
 setup.py | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/setup.py b/setup.py
index e428ca3..d019dec 100644
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,5 @@
-import sys
-
 from setuptools import setup
 
-# Require users to uninstall versions that used the appscale namespace.
-try:
-  import appscale.appscale_tools
-  print('Please run "pip uninstall appscale-tools" first.\n'
-        "Your installed version conflicts with this version's namespace.")
-  sys.exit()
-except ImportError:
-  pass
-
 
 long_description = """AppScale Agents 
 ---------------
@@ -45,8 +34,7 @@
     'adal>=0.4.7',
     'azure==2.0.0',
     'azure-mgmt-marketplaceordering',
-    'cryptography',
-    'argparse',
+    'cryptography>=2.3.0',
     'boto',
     'google-api-python-client==1.5.4',
     'httplib2',
@@ -56,12 +44,7 @@
     'oauth2client==4.0.0',
     'PyYAML',
     'requests[security]>=2.20.0',
-    'retrying==1.3.3',
-    'setuptools>=11.3,<34',
-    'SOAPpy',
-    'tabulate==0.7.7',
-    'termcolor',
-    'wstools==0.4.3'
+    'setuptools>=11.3,<34'
   ],
   extras_require={'testing': ['mock']},
   classifiers=[