diff --git a/doc/requirements.txt b/doc/requirements.txt index fb4f275ae..6bb1fb91d 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,5 @@ -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 sphinxcontrib-httpdomain>=1.3.0 # BSD sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0 diff --git a/lower-constraints.txt b/lower-constraints.txt index 47b572ecc..f33f7e8a9 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -58,7 +58,8 @@ msgpack-python==0.4.0 munch==2.1.0 netaddr==0.7.18 netifaces==0.10.4 -networkx==1.10 +networkx==2.3;python_version>='3.4' +networkx==1.10;python_version<'3.0' nose==1.3.7 oauthlib==0.6.2 openstackdocstheme==1.18.1 diff --git a/requirements.txt b/requirements.txt index f21d2750f..7bc4eb348 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,10 +11,11 @@ dogpile.cache>=0.6.2 # BSD eventlet!=0.20.1,>=0.20.0 # MIT gnocchiclient>=3.3.1 # Apache-2.0 Jinja2>=2.10 # BSD License (3 clause) -jsonschema<3.0.0,>=2.6.0 # MIT +#jsonschema>=2.6.0 # MIT keystonemiddleware>=4.18.0 # Apache-2.0 mistral-lib>=0.4.0 # Apache-2.0 -networkx>=1.10 # BSD +networkx<2.3,>=1.10;python_version<'3.0' # BSD +networkx>=2.3;python_version>='3.4' # BSD oslo.concurrency>=3.26.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 oslo.context>=2.20.0 # Apache-2.0 @@ -65,3 +66,4 @@ WSME>=0.8.0 # MIT yaql>=1.1.3 # Apache 2.0 License tooz>=1.58.0 # Apache-2.0 zake>=0.1.6 # Apache-2.0 + diff --git a/test-requirements.txt b/test-requirements.txt index c2ce4d6c3..756259725 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,8 @@ fixtures>=3.0.0 # Apache-2.0/BSD keystonemiddleware>=4.18.0 # Apache-2.0 mistral-lib>=0.4.0 # Apache-2.0 mock>=2.0.0 # BSD -networkx>=1.10 # BSD +networkx<2.3,>=1.10;python_version<'3.0' # BSD +networkx>=2.3;python_version>='3.4' # BSD nose>=1.3.7 # LGPL oslotest>=3.2.0 # Apache-2.0 oslo.db>=4.27.0 # Apache-2.0