Merge pull request #1 from dnephin/replace_packages_with_deps

Replace packages with deps
dnephin · Jul 31, 2014 · 1db949f · 1db949f
2 parents 847ec5b + ddf95e1
commit 1db949f
Show file tree

Hide file tree

Showing 24 changed files with 30 additions and 1,763 deletions.
diff --git a/fig/cli/command.py b/fig/cli/command.py
@@ -1,13 +1,13 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
-from ..packages.docker import Client
+from docker import Client
 from requests.exceptions import ConnectionError
 import errno
 import logging
 import os
 import re
 import yaml
-from ..packages import six
+import six
 
 from ..project import Project
 from ..service import ConfigError

diff --git a/fig/cli/main.py b/fig/cli/main.py
@@ -16,7 +16,7 @@
 from .log_printer import LogPrinter
 from .utils import yesno
 
-from ..packages.docker.errors import APIError
+from docker.errors import APIError
 from .errors import UserError
 from .docopt_command import NoSuchCommand
 

diff --git a/fig/packages/__init__.py b/fig/packages/__init__.py
diff --git a/fig/packages/docker/__init__.py b/fig/packages/docker/__init__.py
diff --git a/fig/packages/docker/auth/__init__.py b/fig/packages/docker/auth/__init__.py
diff --git a/fig/packages/docker/auth/auth.py b/fig/packages/docker/auth/auth.py