From 659ddefdb0631dfc807930a6b75e4876439c50da Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Fri, 5 May 2017 10:22:14 +0200
Subject: [PATCH] Fix requirements for influxdb and cassandra

Both are optional requirements (but one must be used) so add both to the
"extras" section instead of a commented entry in requirements.txt .

Change-Id: I1f0eca2474ca275f64314a7b30b18e534afefdee
---
 requirements.txt | 2 --
 setup.cfg        | 6 ++++++
 tox.ini          | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e28de1ba..fb75eb97 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,4 @@ oslo.config>=3.22.0 # Apache-2.0
 oslo.log>=3.22.0 # Apache-2.0
 
 six>=1.9.0 # MIT
-#influxdb==2.8.0
-#cassandra-driver>=2.1.4,!=3.6.0 # Apache-2.0
 monasca-common>=1.4.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 3ed0eda3..33adce03 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,6 +28,12 @@ data_files =
         etc/monasca/persister.conf
         etc/monasca/persister-logging.conf
 
+[extras]
+influxdb =
+    influxdb>=2.9.2  # MIT
+cassandra =
+    cassandra-driver>=2.1.4,!=3.6.0 # Apache-2.0
+
 [pbr]
 autodoc_index_modules = True
 
diff --git a/tox.ini b/tox.ini
index 3f75b13a..11c247ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,8 @@ whitelist_externals = bash
                       rm
 install_command =
     {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+deps = .[influxdb,cassandra]
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
   find {toxinidir} -type f -name "*.py[c|o]" -delete