From ca77fb44cddd300a817ab5373c8a9a1d6e8fc247 Mon Sep 17 00:00:00 2001 From: Arseni Lipinski Date: Wed, 24 Apr 2019 16:01:03 +0200 Subject: [PATCH] Change lower-constraints for cassandra-driver Cassandra client version had to be changed because its earlier version doesn't contain DCAwareRoundRobinPolicy and TokenAwarePolicy in cassandra.cluster (those are located in cassandra.policies instead), needed in persister (specifically cassandra/connection_util.py). Change-Id: I9f9eb478808ad978815c19a5c4e1baaa35fa6d28 --- lower-constraints.txt | 2 +- setup.cfg | 5 +++-- test-requirements.txt | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 6a47718b..64b391d9 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,7 +1,7 @@ appdirs==1.3.0 Babel==2.3.4 bandit==1.4.0 -cassandra-driver==2.1.4 +cassandra-driver==2.6.0 coverage==4.0 debtcollector==1.2.0 docutils==0.11 diff --git a/setup.cfg b/setup.cfg index 3105584f..60b2ee6b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,9 +32,10 @@ data_files = [extras] influxdb = - influxdb>=2.9.2 # MIT + influxdb!=5.2.0,!=5.2.1,!=5.2.2,>=2.9.2;python_version<'3.0' # MIT + influxdb>=2.9.2;python_version>='3.0' # MIT cassandra = - cassandra-driver!=3.6.0,>=2.1.4 # Apache-2.0 + cassandra-driver!=3.6.0,>=2.6.0 # Apache-2.0 elasticsearch = elasticsearch<3.0.0,>=2.0.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 047cc37f..be25cb7b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,6 +12,7 @@ docutils>=0.11 # OSI-Approved Open Source, Public Domain pycodestyle>=2.5.0 # MIT # release notes -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD reno>=2.5.0 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0