diff --git a/os_collect_config/merger.py b/os_collect_config/merger.py index f9e7479..e069893 100644 --- a/os_collect_config/merger.py +++ b/os_collect_config/merger.py @@ -42,4 +42,4 @@ def merged_list_from_content(final_content, deployment_keys, collector_name): final_list.append((deployment['name'], deployment['config'])) final_list.insert(0, (collector_name, final_content)) - return final_list \ No newline at end of file + return final_list diff --git a/test-requirements.txt b/test-requirements.txt index bb445cb..cdbf637 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking<0.10,>=0.9.2 +hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 coverage>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD