From f8281cf67f40eab30dc00099b757416f48d7fa78 Mon Sep 17 00:00:00 2001 From: caleb Date: Sun, 1 Jul 2018 11:14:24 -0500 Subject: [PATCH 1/3] py3 compat --- lib/galaxy/tools/deps/__init__.py | 2 +- test/unit/tools/test_tool_deps.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/deps/__init__.py b/lib/galaxy/tools/deps/__init__.py index b344268c9b4..9fab53a096d 100644 --- a/lib/galaxy/tools/deps/__init__.py +++ b/lib/galaxy/tools/deps/__init__.py @@ -182,7 +182,7 @@ class DependencyManager(object): requirements = ToolRequirements([ToolRequirement(name=name, version=version, type=type)]) dep_dict = self._requirements_to_dependencies_dict(requirements, **kwds) if len(dep_dict) > 0: - return dep_dict.values()[0] + return next(iter(dep_dict.values())) # get first dep else: return NullDependency(name=name, version=version) diff --git a/test/unit/tools/test_tool_deps.py b/test/unit/tools/test_tool_deps.py index 7ffa5b6cda4..174ce43fad2 100644 --- a/test/unit/tools/test_tool_deps.py +++ b/test/unit/tools/test_tool_deps.py @@ -631,7 +631,7 @@ def __parse_resolvers(xml_content): @contextmanager def __dependency_manager(xml_content): with __test_base_path() as base_path: - f = tempfile.NamedTemporaryFile() + f = tempfile.NamedTemporaryFile(mode='w') f.write(xml_content) f.flush() dm = __dependency_manager_for_base_path(default_base_path=base_path, conf_file=f.name) From fe003da510d71ad001bb63ed40e6ce45f4ca23c2 Mon Sep 17 00:00:00 2001 From: Caleb Easterly Date: Sun, 1 Jul 2018 13:38:12 -0500 Subject: [PATCH 2/3] fix linting errors --- lib/galaxy/tools/deps/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tools/deps/__init__.py b/lib/galaxy/tools/deps/__init__.py index 9fab53a096d..0e68d8c068d 100644 --- a/lib/galaxy/tools/deps/__init__.py +++ b/lib/galaxy/tools/deps/__init__.py @@ -182,7 +182,7 @@ class DependencyManager(object): requirements = ToolRequirements([ToolRequirement(name=name, version=version, type=type)]) dep_dict = self._requirements_to_dependencies_dict(requirements, **kwds) if len(dep_dict) > 0: - return next(iter(dep_dict.values())) # get first dep + return next(iter(dep_dict.values())) # get first dep else: return NullDependency(name=name, version=version) From 561330fea9eb1a79a52aa48d986218e1b89d8800 Mon Sep 17 00:00:00 2001 From: Caleb Easterly Date: Mon, 2 Jul 2018 19:28:09 -0500 Subject: [PATCH 3/3] rewind change --- test/unit/tools/test_tool_deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/tools/test_tool_deps.py b/test/unit/tools/test_tool_deps.py index 174ce43fad2..7ffa5b6cda4 100644 --- a/test/unit/tools/test_tool_deps.py +++ b/test/unit/tools/test_tool_deps.py @@ -631,7 +631,7 @@ def __parse_resolvers(xml_content): @contextmanager def __dependency_manager(xml_content): with __test_base_path() as base_path: - f = tempfile.NamedTemporaryFile(mode='w') + f = tempfile.NamedTemporaryFile() f.write(xml_content) f.flush() dm = __dependency_manager_for_base_path(default_base_path=base_path, conf_file=f.name)