diff options
| author | Sean McGinnis <sean.mcginnis@gmail.com> | 2019-04-09 08:44:44 -0500 |
|---|---|---|
| committer | Sean McGinnis <sean.mcginnis@gmail.com> | 2019-05-04 14:12:20 -0500 |
| commit | 8bcef3f5e74f4a3ad47aaccc5697ac2a8d76deb8 (patch) | |
| tree | ae68c1f01d50cd13796ee9a1b5788ef7c4150f2f | |
| parent | dbe22b3ed41688b803f5440dd23922d68aa1e062 (diff) | |
| download | taskflow-8bcef3f5e74f4a3ad47aaccc5697ac2a8d76deb8.tar.gz | |
Uncap jsonschema
We have jsonschema capped at a fairly old version. Other than some
specific releases, it looks like keeping it below 3.0 was added in
I943fd68b9fab3bce1764305a5058df5339470757 without really any explanation
why.
In order to update to a 3.x release we need to:
1. Remove the cap from global-requirements.txt (see Depends-On), leaving
upper-constraints.txt at a 2.x release
2. Remove the cap from all consumers (this change)
3. Release a new version of consumers that are published to pypi
4. Update upper-constraints.txt with those new releases
5. Update jsonschema in upper-constraints.txt to a 3.X release
(See: https://review.openstack.org/649789)
6. Test consumers with the change from 5.
7. [Optional] fix issues in consumers that arise from 6.
8. Merge the change from 5.
Also includes squashed commit:
Raise lower constraint of psycopg2
Versions prior to 3.7 did not support postgresql version numbering
starting with postgresql 10, causing setup failures. This raises the
lower-constraint to the first version that contained the fix [0] to
support that.
With the change in global requirements for jsonschema, requirements
check fails on raising psycopg2, but we need that raised in order for
the jsonschema version to be raised.
[0] https://github.com/psycopg/psycopg2/pull/504
Also required updating networkx constraints to match current g-r.
Change-Id: Ifd0f0586f945d1da4dd597ae7b4514117cd49f57
Co-Authored-by: Sean McGinnis <sean.mcginnis@gmail.com>
Depends-On: https://review.openstack.org/649669
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | requirements.txt | 5 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
5 files changed, 7 insertions, 5 deletions
@@ -5,6 +5,7 @@ # Packages *.egg +*.eggs *.egg-info dist build diff --git a/lower-constraints.txt b/lower-constraints.txt index bddc7c4..e7ea88d 100644 --- a/lower-constraints.txt +++ b/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 diff --git a/requirements.txt b/requirements.txt index 80d7a9d..49a749f 100644 --- a/requirements.txt +++ b/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 @@ -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 diff --git a/test-requirements.txt b/test-requirements.txt index b334d6b..e15ffb9 100644 --- a/test-requirements.txt +++ b/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 |