Merge branch 'release/1.1'

Author: Jesse Myers

.gitignore

@@ -53,4 +53,5 @@ docs/_build/
 # PyBuilder
 target/
 
-cover
+cover
+.eggs

CHANGES.md

@@ -1,3 +1,7 @@
 
+Version 1.1:
+ - Ensure that project name matches directory structure.
+ - Better handling of container deletion errors.
+
 Version 1.0:
  - Initial release

dockerrotate/main.py

@@ -140,7 +140,7 @@ def clean_containers(client, args):
         try:
             client.remove_container(container["Id"])
         except APIError as error:
-            print "Unable to remove container: {}: {}".format(
+            print "Unable to remove container: {}: {}".format(  # noqa
                 container["Id"],
                 error,
             )

setup.py

@@ -2,19 +2,19 @@
 
 from setuptools import setup, find_packages
 
-__version__ = '1.0'
+__version__ = '1.1'
 
 __build__ = ''
 
-setup(name='docker-rotate',
+setup(name='dockerrotate',
       version=__version__ + __build__,
       description='Docker image rotation tool',
       author='Location Labs',
       author_email='[email protected]',
       url='http://locationlabs.com',
       packages=find_packages(exclude=['*.tests']),
       setup_requires=[
-          'nose>=1.0',
+          'nose>=1.3.7',
       ],
       install_requires=[
           'docker-py>=0.5.3',

tox.ini

@@ -6,8 +6,7 @@ commands =
     python setup.py nosetests --with-coverage --cover-package=dockerrotate --cover-erase --cover-html
     python setup.py sdist
 deps =
-    setuptools==3.6
-
+    setuptools>=17.1
 
 [testenv:lint]
 commands=flake8 --max-line-length 99 dockerrotate