Merge pull request #2767 from nsoranzo/release_16.01_handle_complex_r…

…epository_dependency_for_package [16.01] Fix misplaced parenthesis
galaxyproject · Aug 10, 2016 · 68f718d · 68f718d
2 parents f4631d2 + f4cb63d
commit 68f718d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git 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/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 @@ def handle_complex_repository_dependency_for_package( self, elem, package_name,
                                                                                                         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

diff --git 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]