Merge branch 'patch-1' of https://github.com/luzfcb/docker-py into luzfcb-patch-1

Conflicts:
	setup.py
This commit is contained in:
Joffrey F 2015-04-22 11:16:44 -07:00
commit ee096c867f
1 changed files with 5 additions and 2 deletions

View File

@ -24,8 +24,11 @@ setup(
name="docker-py",
version=version,
description="Python client for Docker.",
packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils', 'docker.utils.ports',
'docker.ssladapter'],
url='https://github.com/docker/docker-py/',
packages=[
'docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
'docker.utils.ports', 'docker.ssladapter'
],
install_requires=requirements,
tests_require=test_requirements,
zip_safe=False,