Skip to content

Commit 4e9e9a1

Browse files
committed
Merge pull request #1 from jmchilton/pulsar-planemo-lib-update
Remove old XSD linting code.
2 parents a1726d2 + 45e3257 commit 4e9e9a1

3 files changed

Lines changed: 3 additions & 73 deletions

File tree

lib/galaxy/tools/deps/resolvers/tool_shed_packages.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ def _find_dep_default( self, name, type='package', **kwds ):
2424
installed_tool_dependency = self._get_installed_dependency( name, type, version=None, **kwds )
2525
if installed_tool_dependency:
2626
dependency = self._get_set_environment_installed_dependency_script_path( installed_tool_dependency, name )
27-
if dependency.script and dependency.path:
27+
is_galaxy_dep = isinstance(dependency, GalaxyPackageDependency)
28+
has_script_dep = is_galaxy_dep and dependency.script and dependency.path
29+
if has_script_dep:
2830
# Environment settings do not use versions.
2931
return GalaxyPackageDependency(dependency.script, dependency.path, None)
3032
return INDETERMINATE_DEPENDENCY

lib/galaxy/tools/linters/xsd.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

lib/galaxy/tools/linters/xsd_util.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)