setup.py: move orchestra related stuff to optional deps

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst
index 712bb57cacef7539991180762320bb14fabdeab5..e02704ef6990ff9cb5390361a85944eb8a6e4916 100644 (file)
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -54,3 +54,9 @@ However if you prefer, you may install ``teuthology`` from `PyPI <http://pypi.py
 
 **Note**: The version in PyPI can be (*far*) behind the development version.
 
+Or from GitHub::
+
+    pip install git+https://github.com/ceph/teuthology#egg=teuthology[orchestra]
+
+where the dependencies for orchestrating are installed. They are used for
+interacting with the services to schedule tests and to report the test results.

diff --git a/setup.py b/setup.py
index 865d68626fc9d4abdeafbb4c2e5f0549b75050fe..9969e7bf0cd116fb8a19f318f71bf8fbd691f60b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -53,41 +53,20 @@ setup(
                       'gevent',
                       'PyYAML',
                       'argparse >= 1.2.1',
-                      'beanstalkc3 >= 0.4.0',
                       'boto >= 2.0b4',
                       'bunch >= 1.0.0',
                       'configobj',
                       'six >= 1.9', # python-openstackclient won't work properly with less
-                      'httplib2',
-                      'paramiko',
                       'pexpect',
                       'pytest', # for tox.ini
                       'nose', # for qa/tasks/rgw_multisite_tests.py',
-                      'requests != 2.13.0',
-                      'raven',
                       'web.py',
                       'docopt',
                       'psutil >= 2.1.0',
                       'configparser',
                       'ansible>=2.0',
-                      'pyopenssl>=0.13',
-                      'ndg-httpsclient',
-                      'pyasn1',
-                      # python-novaclient is specified here, even though it is
-                      # redundant, because python-openstackclient requires
-                      # Babel, and installs 2.3.3, which is forbidden by
-                      # python-novaclient 4.0.0
-                      'python-novaclient',
-                      'python-openstackclient',
-                      # with openstacklient >= 2.1.0, neutronclient no longer is
-                      # a dependency but we need it anyway.
-                      'python-neutronclient',
                       'prettytable',
-                      'python-dateutil',
                       'manhole',
-                      'apache-libcloud',
-                      # For apache-libcloud when using python < 2.7.9
-                      'backports.ssl_match_hostname',
                       # For bucket notification testing in multisite
                       'xmltodict',
                       'boto3',
@@ -95,6 +74,29 @@ setup(
                       ],
     extras_require = {
         'coverage': [ 'mysqlclient == 1.4.2'],
+        'orchestra': [
+            'apache-libcloud',
+            # For apache-libcloud when using python < 2.7.9
+            'backports.ssl_match_hostname',
+            'beanstalkc3 >= 0.4.0',
+            'httplib2',
+            'ndg-httpsclient',  # for requests, urllib3
+            'paramiko',
+            'pyasn1',           # for requests, urllib3
+            'pyopenssl>=0.13',  # for requests, urllib3
+            'python-dateutil',
+            # python-novaclient is specified here, even though it is
+            # redundant, because python-openstackclient requires
+            # Babel, and installs 2.3.3, which is forbidden by
+            # python-novaclient 4.0.0
+            'python-novaclient',
+            'python-openstackclient',
+            # with openstacklient >= 2.1.0, neutronclient no longer is
+            # a dependency but we need it anyway.
+            'python-neutronclient',
+            'raven',
+            'requests != 2.13.0',
+        ]
     },