opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-16 07:19:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change DependencyType class variable to dependency_type

Browse Source
This commit is contained in:
Marius van den Beek
2016-08-09 12:42:47 +02:00
parent 0bfa56f010
commit f8fef32697
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/deps/resolvers/galaxy_packages.py
+3 -3
View File
@@ -46,7 +46,7 @@ class ToolShedDependency(GalaxyPackageDependency):
class BaseGalaxyPackageDependencyResolver(DependencyResolver, UsesToolDependencyDirMixin):
dict_collection_visible_keys = DependencyResolver.dict_collection_visible_keys + ['base_path', 'versionless']
DependencyType = GalaxyPackageDependency
dependency_type = GalaxyPackageDependency
def __init__(self, dependency_manager, **kwds):
# Galaxy tool shed requires explicit versions on XML elements,
@@ -86,9 +86,9 @@ class BaseGalaxyPackageDependencyResolver(DependencyResolver, UsesToolDependency
def _galaxy_package_dep( self, path, version, name, exact ):
script = join( path, 'env.sh' )
if exists( script ):
return self.DependencyType(script, path, version, name, exact)
return self.dependency_type(script, path, version, name, exact)
elif exists( join( path, 'bin' ) ):
return self.DependencyType(None, path, version, name, exact)
return self.dependency_type(None, path, version, name, exact)
return NullDependency(version=version, name=name)
lib/galaxy/tools/deps/resolvers/tool_shed_packages.py
+1 -1
View File
@@ -10,7 +10,7 @@ class ToolShedPackageDependencyResolver(BaseGalaxyPackageDependencyResolver, Use
# Resolution of these dependencies depends on more than just the requirement
# tag, it depends on the tool installation context - therefore these are
# non-simple.
DependencyType = ToolShedDependency
dependency_type = ToolShedDependency
resolves_simple_dependencies = False
def __init__(self, dependency_manager, **kwds):