Upgrade from docker-py to docker

The pypi package 'docker-py' [1] has been renamed to 'docker' [2].
We need to move to the new 'docker' package in order to leverage
the up-to-date features.

[1] https://pypi.python.org/pypi/docker-py
[2] https://pypi.python.org/pypi/docker

Change-Id: I72951c2d3a19b0bcfc185d0cd7b9e30ba5d40b25
This commit is contained in:
Hongbin Lu 2017-06-20 18:23:30 +00:00
parent a477536c02
commit 9c5e45fa56
2 changed files with 2 additions and 2 deletions

View File

@ -115,7 +115,7 @@ class FuxiBaseTest(base.BaseTestCase):
"""
def setUp(self):
super(FuxiBaseTest, self).setUp()
self.docker_client = docker.Client(
self.docker_client = docker.APIClient(
base_url='tcp://0.0.0.0:2375')
try:
self.cinder_client = get_cinder_client_from_env()

View File

@ -5,7 +5,7 @@
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
docker-py>=1.8.1 # Apache-2.0
docker>=2.0.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx>=1.6.2 # BSD
oslosphinx>=4.7.0 # Apache-2.0