diff options
author | Sean McGinnis <sean.mcginnis@gmail.com> | 2020-03-13 13:49:02 -0500 |
---|---|---|
committer | Stephen Finucane <stephenfin@redhat.com> | 2021-01-14 14:13:25 +0000 |
commit | af9e8837c30a1e90ead7a83a6ac3f1a319126ae6 (patch) | |
tree | 4e6dcccb3051927a2ddbecf56348afb3fcd1182e | |
parent | 384c077d34efb02d2c71ca0a4cdd59ea2bdeace0 (diff) | |
download | os-client-config-stable/stein.tar.gz |
Uncap jsonschemastable/stein
jsonschema was uncapped in the global requirements. We need to uncap it
locally now too.
NOTE(stephenfin): This is needed to resolve conflicts with the new
dependency resolver found in pip 20.3. We also need to include the
following additional requirement-related changes to get things passing:
- doc/requirements.txt
Ensure specific versions of Sphinx are used on different Python
versions.
- lower-constraints.txt
Remove hacking since it's not necessary
- test-requirements.txt
Remove hacking since it's not necessary
- tox.ini
Set a hacking version to avoid installing the latest and greatest
versions
Conflicts:
test-requirements.txt
Changes:
doc/requirements.txt
NOTE(stephenfin): Conflicts are because the version of hacking used here
is different to stable/train. We also need to update the Sphinx versions
listed in 'doc/requirements.txt' to match those provided by
openstack/requirements.
Change-Id: Ia6ad2c7e62aebc81386610e9d16c8bb8a162d70f
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
(cherry picked from commit c7bb5d65abb4c9bc3a1d8f480018a9d661f7b36e)
(cherry picked from commit 68c7bac81d5713a8b9a885db1ab824afaf28813c)
-rw-r--r-- | doc/requirements.txt | 5 | ||||
-rw-r--r-- | lower-constraints.txt | 1 | ||||
-rw-r--r-- | test-requirements.txt | 4 | ||||
-rw-r--r-- | tox.ini | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index bd99db7..c446891 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,7 +1,8 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -docutils>=0.11 # OSI-Approved Open Source, Public Domain -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD + +sphinx>=1.6.2,!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD +sphinx>=1.6.2,!=1.6.6,!=1.6.7;python_version>='3.4' # BSD openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 diff --git a/lower-constraints.txt b/lower-constraints.txt index 3e9ce30..e46f9ff 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -11,7 +11,6 @@ extras==1.0.0 fixtures==3.0.0 flake8==2.5.5 future==0.16.0 -hacking==0.12.0 idna==2.6 iso8601==0.1.12 jsonpatch==1.16 diff --git a/test-requirements.txt b/test-requirements.txt index 76e4748..6357d04 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,12 +2,10 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 - coverage!=4.4,>=4.0 # Apache-2.0 extras>=1.0.0 # MIT fixtures>=3.0.0 # Apache-2.0/BSD -jsonschema<3.0.0,>=2.6.0 # MIT +jsonschema>=2.6.0 # MIT mock>=2.0.0 # BSD python-glanceclient>=2.8.0 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD @@ -29,7 +29,7 @@ skip_install = True deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/stein} doc8 - hacking + hacking>=1.1.0,<1.2.0 pygments readme commands = |