Cap sphinx for py2 and drop keyring dependency

Sphinx 2.0.0 dropped Python 2.7 support. This is aligned with
[1] in requirements project.
[1]Change-Id If558f184c959e4b63b56dec3ca1571d1034cfe5c

keyring is also removed since it hasn't been used since change
I62188e73a48f6878ce920a3b4724dba101564aef.

Change-Id: Ib632c327637ba1161a8c07605fd3ef327f5606ee
This commit is contained in:
zhangbailin 2019-05-15 10:28:03 +08:00 committed by Matt Riedemann
parent b907585d87
commit 8c3311eefe
3 changed files with 2 additions and 3 deletions

View File

@ -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.
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
openstackdocstheme>=1.18.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0
sphinxcontrib-apidoc>=0.2.0 # BSD

View File

@ -33,7 +33,6 @@ jmespath==0.9.0
jsonpatch==1.16
jsonpointer==1.13
jsonschema==2.6.0
keyring==5.5.1
keystoneauth1==3.5.0
kombu==4.0.0
linecache2==1.0.0

View File

@ -7,7 +7,6 @@ bandit>=1.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD
keyring>=5.5.1 # MIT/PSF
mock>=2.0.0 # BSD
python-keystoneclient>=3.8.0 # Apache-2.0
python-cinderclient>=3.3.0 # Apache-2.0