Merge "Uncap jsonschema"

.gitignore

@@ -5,6 +5,7 @@
 
 # Packages
 *.egg
+*.eggs
 *.egg-info
 dist
 build

lower-constraints.txt

@@ -47,7 +47,7 @@ oslotest==3.2.0
 pbr==2.0.0
 pep8==1.5.7
 prettytable==0.7.2
-psycopg2==2.6.2
+psycopg2==2.7.0
 pydot==1.2.4
 pydotplus==2.0.2
 pyflakes==0.8.1

requirements.txt

@@ -20,7 +20,8 @@ futurist>=1.2.0 # Apache-2.0
 fasteners>=0.7.0 # Apache-2.0
 
 # Very nice graph library
-networkx>=1.10 # BSD
+networkx>=1.10,<2.3;python_version<'3.0'  # BSD
+networkx>=1.10;python_version>='3.4'  # BSD
 
 # For contextlib new additions/compatibility for <= python 3.3
 contextlib2>=0.4.0;python_version<'3.0' # PSF License
@@ -32,7 +33,7 @@ stevedore>=1.20.0 # Apache-2.0
 futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
 
 # Used for structured input validation
-jsonschema<3.0.0,>=2.6.0 # MIT
+jsonschema>=2.6.0 # MIT
 
 # For the state machine we run with
 automaton>=1.9.0 # Apache-2.0

setup.cfg

@@ -72,7 +72,7 @@ database =
   alembic>=0.8.10 # MIT
   SQLAlchemy-Utils>=0.30.11 # BSD License
   PyMySQL>=0.7.6 # MIT License
-  psycopg2>=2.6.2 # LGPL/ZPL
+  psycopg2>=2.7.0 # LGPL/ZPL
 test =
   pydotplus>=2.0.2 # MIT License
   hacking<0.11,>=0.10.0

test-requirements.txt

@@ -20,7 +20,7 @@ SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 alembic>=0.8.10 # MIT
 SQLAlchemy-Utils>=0.30.11 # BSD License
 PyMySQL>=0.7.6 # MIT License
-psycopg2>=2.6.2 # LGPL/ZPL
+psycopg2>=2.7.0 # LGPL/ZPL
 
 # test
 pydotplus>=2.0.2 # MIT License