From 01dd021fa5a0a062db9277e7a34eebbebbc87071 Mon Sep 17 00:00:00 2001 From: Kirby Files Date: Fri, 19 Jan 2018 23:57:21 -0500 Subject: [PATCH 1/2] Use extend() to merge lists; append() only works with single elements --- registry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry.py b/registry.py index 19a4794..3926e06 100755 --- a/registry.py +++ b/registry.py @@ -434,7 +434,7 @@ def main_loop(args): # add tags to "tags_to_keep" list, if we have regexp "tags_to_keep" entries: keep_tags=[] if args.keep_tags_like: - keep_tags.append(get_tags_like(args.keep_tags_like, tags_list)) + keep_tags.extend(get_tags_like(args.keep_tags_like, tags_list)) # delete tags if told so From 617e3e86e5ae1fb4985d132f3e8238b0da565f78 Mon Sep 17 00:00:00 2001 From: Andrey Pohilko Date: Sat, 20 Jan 2018 18:21:35 +0600 Subject: [PATCH 2/2] reorder files and change circle instructions --- circle.yml | 4 ++-- requirements-ci.txt | 3 +++ requirements-test.txt | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 requirements-ci.txt delete mode 100644 requirements-test.txt diff --git a/circle.yml b/circle.yml index bec0c1f..f853176 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ dependencies: pre: - - pip install -r requirements.txt + - pip install -r requirements-ci.txt test: override: @@ -8,4 +8,4 @@ test: post: - mkdir -p $CIRCLE_ARTIFACTS/coverage - coverage html -d $CIRCLE_ARTIFACTS/coverage - - mv .coverage $CIRCLE_ARTIFACTS \ No newline at end of file + - mv .coverage $CIRCLE_ARTIFACTS diff --git a/requirements-ci.txt b/requirements-ci.txt new file mode 100644 index 0000000..dd36125 --- /dev/null +++ b/requirements-ci.txt @@ -0,0 +1,3 @@ +mock +coverage + diff --git a/requirements-test.txt b/requirements-test.txt deleted file mode 100644 index dff9b92..0000000 --- a/requirements-test.txt +++ /dev/null @@ -1,2 +0,0 @@ -mock -coverage \ No newline at end of file