From e56bc51fe2ec0e54fe7501fcff0eca6e9e782c0d Mon Sep 17 00:00:00 2001 From: shin- Date: Wed, 23 Oct 2013 20:03:04 +0200 Subject: [PATCH] Fixed ImportErrors / package structure --- docker/auth/__init__.py | 2 -- docker/utils/__init__.py | 2 +- setup.py | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docker/auth/__init__.py b/docker/auth/__init__.py index 90c90298..66acdb36 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 391eb2ee..82f94413 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 9c5a1ef0..25baf16a 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' -], - ) + ], +)