diff options
| -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..2a8d917 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.8.0,<2.0.0;python_version=='2.7' # BSD +sphinx>=1.8.0,!=2.1.0;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 ca4c307..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>=1.1.0,<1.2.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/train} doc8 - hacking + hacking>=1.1.0,<1.2.0 pygments readme commands = |