openstack/requirements
Code Issues Proposed changes

Reestablish upper-cap for docker-py

Browse Source 
This commit reverts ecdbd1a6e90360f08680f4bba06671fd6203dd47

Newer docker-py also introduces conflicts over requests and
tripleo-common. Reestablish upper cap until this is resolved.

Change-Id: I297785a4407822093d003cab17165941b034b40f
This commit is contained in:
Dirk Mueller 2016-10-04 14:20:11 +02:00
parent 1048861f18
commit 22b64cebbe
2 changed files with 2 additions and 3 deletions

2
global-requirements.txt

@ -310,7 +310,7 @@ cliff-tablib>=1.0 # Apache-2.0
couchdb>=0.8 # Apache-2.0
coverage>=3.6 # Apache-2.0
demjson # GLGPLv3+
docker-py>=1.6.0,!=1.8.0 # Apache-2.0
docker-py>=1.6.0,<1.8.0 # Apache-2.0
discover # BSD
django-nose>=1.4.4 # BSD
doc8 # Apache-2.0

3
upper-constraints.txt

@ -114,8 +114,7 @@ django-pyscss===2.0.2
dnspython===1.14.0;python_version=='2.7'
dnspython3===1.12.0;python_version=='3.4' or python_version=='3.5'
doc8===0.7.0
docker-py===1.10.3
docker-pycreds===0.2.1
docker-py===1.7.2
docutils===0.12
dogpile.cache===0.6.2
dogtag-pki===10.3.5.1