From c8710251b8f5fc79661f0c73c3a78a6998c1281c Mon Sep 17 00:00:00 2001 From: Sam Napolitano Date: Thu, 1 Mar 2018 13:38:21 -0500 Subject: [PATCH 1/6] Correctly handle empty dangling volumes When there's no dangling volumes 'None' is returned but code is expecting List. Convert to empty list. --- docker_custodian/docker_gc.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker_custodian/docker_gc.py b/docker_custodian/docker_gc.py index cfcfa83..68a33f4 100644 --- a/docker_custodian/docker_gc.py +++ b/docker_custodian/docker_gc.py @@ -77,6 +77,8 @@ def get_all_images(client): def get_dangling_volumes(client): log.info("Getting dangling volumes") volumes = client.volumes({'dangling': True})['Volumes'] + if volumes == None: + volumes = [] log.info("Found %s dangling volumes", len(volumes)) return volumes From e17dd441be7f6ef8a96c634c47af468aea92b3b9 Mon Sep 17 00:00:00 2001 From: Sam Napolitano Date: Thu, 1 Mar 2018 13:38:21 -0500 Subject: [PATCH 2/6] Correctly handle empty dangling volumes When there's no dangling volumes 'None' is returned but code is expecting List. Convert to empty list. --- docker_custodian/docker_gc.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker_custodian/docker_gc.py b/docker_custodian/docker_gc.py index cfcfa83..68a33f4 100644 --- a/docker_custodian/docker_gc.py +++ b/docker_custodian/docker_gc.py @@ -77,6 +77,8 @@ def get_all_images(client): def get_dangling_volumes(client): log.info("Getting dangling volumes") volumes = client.volumes({'dangling': True})['Volumes'] + if volumes == None: + volumes = [] log.info("Found %s dangling volumes", len(volumes)) return volumes From 9aaa244b6848dac154e48b5a928cc8f491a83a1e Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 2 Mar 2018 17:10:38 -0500 Subject: [PATCH 3/6] Be more idiomatic in testing for volumes --- docker_custodian/docker_gc.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker_custodian/docker_gc.py b/docker_custodian/docker_gc.py index 68a33f4..db7aba9 100644 --- a/docker_custodian/docker_gc.py +++ b/docker_custodian/docker_gc.py @@ -76,9 +76,7 @@ def get_all_images(client): def get_dangling_volumes(client): log.info("Getting dangling volumes") - volumes = client.volumes({'dangling': True})['Volumes'] - if volumes == None: - volumes = [] + volumes = client.volumes({'dangling': True})['Volumes'] or [] log.info("Found %s dangling volumes", len(volumes)) return volumes From 79c56d00ef6bfa159ee391b0a3bcedfd918a4e93 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 2 Mar 2018 17:23:20 -0500 Subject: [PATCH 4/6] Get tests working again by updating git pre-hooks --- .pre-commit-config.yaml | 3 ++- debian/changelog | 6 +++--- tox.ini | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 513b174..624406f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,6 @@ +repos: - repo: git://github.com/pre-commit/pre-commit-hooks - sha: 'v0.4.2' + sha: v1.2.3 hooks: - id: check-added-large-files - id: check-docstring-first diff --git a/debian/changelog b/debian/changelog index 2ab3ecd..bcc54c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ docker-custodian (0.7.0) lucid; urgency=low docker-custodian (0.6.1) lucid; urgency=low - * New release for pypi + * New release for pypi -- kwa Wed, 31 Aug 2016 09:49:37 -0700 @@ -25,7 +25,7 @@ docker-custodian (0.5.3) lucid; urgency=low docker-custodian (0.5.2) lucid; urgency=low - * Fixed bug where never started containers that are not old were getting removed + * Fixed bug where never started containers that are not old were getting removed -- Semir Patel Tue, 15 Dec 2015 09:44:26 -0800 @@ -58,7 +58,7 @@ docker-custodian (0.3.2) lucid; urgency=low docker-custodian (0.3.1) lucid; urgency=low - * Fix broken commands + * Fix broken commands -- Daniel Nephin Mon, 09 Mar 2015 17:58:03 -0700 diff --git a/tox.ini b/tox.ini index 355c2b5..f5aa006 100644 --- a/tox.ini +++ b/tox.ini @@ -9,5 +9,6 @@ deps = pytest commands = py.test {posargs:tests} + pre-commit autoupdate pre-commit install -f --install-hooks pre-commit run --all-files From 02ddd872d23db54cc3a82ffacf6ff886f56e92b2 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 3 Mar 2018 23:17:17 -0500 Subject: [PATCH 5/6] Updated pre-commit-config --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 624406f..a5c721d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: git://github.com/pre-commit/pre-commit-hooks - sha: v1.2.3 + rev: v1.2.3 hooks: - id: check-added-large-files - id: check-docstring-first From b93aaa89564cf033772205196c1ea75aa6a65168 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 5 Mar 2018 09:21:00 -0500 Subject: [PATCH 6/6] Update travis config and python to newer versions --- .travis.yml | 12 ++++++++---- tox.ini | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b8fc1e..11164d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,12 @@ language: python -env: -- TOXENV=py27 -- TOXENV=py33 -- TOXENV=py34 +matrix: + include: + - python: 2.7 + env: TOXENV=py27 + - python: 3.5 + env: TOXENV=py35 + - python: 3.6 + env: TOXENV=py36 install: - pip install tox script: diff --git a/tox.ini b/tox.ini index f5aa006..8713cf8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py33,py34 +envlist = py27,py35,py36 [testenv] deps =