Sync with openstack/requirements master branch

In order to accept the requirements contract defined in
openstack/requirements, we need to sync with the master branch of that
project's global-requirements.txt and test-requirements.txt files.

Most of the changes are just version changes and nothing major.  The
only major change is:

1) The twine dependency is removed, and therefore the pypi tox
environment was also removed.

Change-Id: Idbe9e73ddc5a34ac49aa6f6eff0779d46a75f583
Closes-Bug: #1533282
This commit is contained in:
Taylor Peoples
2016-01-18 23:21:01 +01:00
committed by David TARDIVEL
parent b440f5c69a
commit 0ba8a35ade
4 changed files with 464 additions and 419 deletions

View File

@@ -8,17 +8,13 @@ doc8 # Apache-2.0
hacking>=0.10.2,<0.11
mock>=1.2
oslotest>=1.10.0 # Apache-2.0
os-testr>=0.1.0
os-testr>=0.4.1
python-subunit>=0.0.18
testrepository>=0.0.18
testscenarios>=0.4
testtools>=1.4.0
# Doc requirements
oslosphinx>=2.5.0 # Apache-2.0
oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
sphinxcontrib-pecanwsme>=0.8
# For PyPI distribution
twine