Merge branch 'dnephin-replace_packages_with_deps'

Closes #375

Author: bfirsh

.travis.yml

@@ -3,9 +3,9 @@ python:
 - '2.6'
 - '2.7'
 install:
-- pip install .
 - pip install -r requirements.txt
 - pip install -r requirements-dev.txt
+- pip install .
 script:
  - script/validate-dco
  - flake8 fig

Dockerfile

@@ -1,12 +1,17 @@
 FROM ubuntu:14.04
-RUN apt-get update -qq && apt-get install -qy python python-pip python-dev
-ADD requirements.txt /code/
+RUN apt-get update -qq && apt-get install -qy python python-pip python-dev git
+RUN useradd -d /home/user -m -s /bin/bash user
+
 WORKDIR /code/
+
+ADD requirements.txt /code/
 RUN pip install -r requirements.txt
+
 ADD requirements-dev.txt /code/
 RUN pip install -r requirements-dev.txt
+
 ADD . /code/
-RUN python setup.py develop
-RUN useradd -d /home/user -m -s /bin/bash user
+RUN python setup.py install
+
 RUN chown -R user /code/
 USER user

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

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
 

fig/cli/verbose_proxy.py

@@ -4,7 +4,7 @@
 import logging
 import pprint
 
-from fig.packages import six
+import six
 
 
 def format_call(args, kwargs):