From 33c4025fabc057a412c2da662b3606afc0726902 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Wed, 10 Aug 2016 14:34:05 +0100 Subject: [PATCH 1/2] Fix misplaced parenthesis Reported by @dpryan79 in https://github.com/galaxyproject/tools-iuc/issues/906#issuecomment-238844304 --- .../galaxy_install/tool_dependencies/recipe/tag_handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py b/lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py index 2198ceb8512..a8cea5d74a8 100644 --- a/lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py @@ -418,9 +418,9 @@ class Repository( RecipeTag, SyncDatabase ): dependent_install_dir, tool_dependency_type='package' ) if not can_install_tool_dependency: - log.debug( "Tool dependency %s version %s cannot be installed (it was probably previously installed), " % - ( str( tool_dependency.name, str( tool_dependency.version ) ) ) ) - log.debug( "so appending it to the list of handled tool dependencies." ) + log.debug( "Tool dependency %s version %s cannot be installed (it was probably previously installed), " + "so appending it to the list of handled tool dependencies.", + str( tool_dependency.name), str( tool_dependency.version ) ) handled_tool_dependencies.append( tool_dependency ) else: can_install_tool_dependency = True From f4cb63d6f27f68814bd6131f43c1eee6fa8d099e Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Wed, 10 Aug 2016 15:17:17 +0100 Subject: [PATCH 2/2] Pin flake8 version Do not pin when forward-merging to dev branch. Also ignore .tox/ and eggs/ as in #2650 . --- .ci/flake8_blacklist.txt | 2 ++ tox.ini | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/flake8_blacklist.txt b/.ci/flake8_blacklist.txt index fc0d305bde8..37de99af606 100644 --- a/.ci/flake8_blacklist.txt +++ b/.ci/flake8_blacklist.txt @@ -1,4 +1,6 @@ .venv/ +.tox/ +eggs/ client/ database/ doc/patch.py diff --git a/tox.ini b/tox.ini index 0e0676b4b19..9bdfcbcdc81 100644 --- a/tox.ini +++ b/tox.ini @@ -6,17 +6,17 @@ skipsdist = True [testenv:py27-lint] commands = bash .ci/flake8_wrapper.sh whitelist_externals = bash -deps = flake8 +deps = flake8==3.0.4 [testenv:py26-lint] commands = bash .ci/flake8_wrapper.sh whitelist_externals = bash -deps = flake8 +deps = flake8<3.0.0 [testenv:py34-lint] commands = bash .ci/flake8_py3_wrapper.sh whitelist_externals = bash -deps = flake8 +deps = flake8==3.0.4 [testenv:py27-unit]