summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshin- <joffrey@dotcloud.com>2013-10-23 20:03:04 +0200
committershin- <joffrey@dotcloud.com>2013-10-23 20:03:04 +0200
commite56bc51fe2ec0e54fe7501fcff0eca6e9e782c0d (patch)
tree9be9676caf004ac046b58df297c81a1e35ea4122
parent8be4c1f0d3f07adea63c95d5b1d293f9222f9ccc (diff)
downloaddocker-py-e56bc51fe2ec0e54fe7501fcff0eca6e9e782c0d.tar.gz
Fixed ImportErrors / package structure
-rw-r--r--docker/auth/__init__.py2
-rw-r--r--docker/utils/__init__.py2
-rw-r--r--setup.py6
3 files changed, 4 insertions, 6 deletions
diff --git a/docker/auth/__init__.py b/docker/auth/__init__.py
index 90c9029..66acdb3 100644
--- a/docker/auth/__init__.py
+++ b/docker/auth/__init__.py
@@ -1,5 +1,3 @@
-
-
from .auth import (
INDEX_URL,
encode_header,
diff --git a/docker/utils/__init__.py b/docker/utils/__init__.py
index 391eb2e..82f9441 100644
--- a/docker/utils/__init__.py
+++ b/docker/utils/__init__.py
@@ -1 +1 @@
-from .utils import mkbuildcontext, tar, compare_version # flake8: noqa
+from .utils import compare_version, mkbuildcontext, ping, tar # flake8: noqa
diff --git a/setup.py b/setup.py
index 9c5a1ef..25baf16 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
name="docker-py",
version='0.2.1',
description="Python client for Docker.",
- packages=['docker'],
+ packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils'],
install_requires=requirements + test_requirements,
zip_safe=False,
test_suite='tests',
@@ -24,5 +24,5 @@ setup(
'Programming Language :: Python',
'Topic :: Utilities',
'License :: OSI Approved :: Apache Software License'
-],
- )
+ ],
+)