Constraint networkx to <2.3 for Python 2

NetworkX released 2.3, dropping support for Python 2.

 https://github.com/networkx/networkx/blob/master/doc/news.rst

 Also see I0a9700926c9a0db93e782c853c33f1aaee3d4876

 fixed sphinx requirements also according to global requirements
 
 jsonschema should be uncaped also according to global requirements
 but there are conflicts with zakarclient designateclient and irconicclient
 
 so for now I put it in remark

Change-Id: Iea3dbcfa1f6ddf2c413ede5e73fa076c6edccfdf
This commit is contained in:
Hervé Beraud 2019-05-20 14:13:55 +02:00 committed by Eyal
parent a477fe49cd
commit 831162ac0a
4 changed files with 10 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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