opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-28 02:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_22.01' into release_22.05

Browse Source
This commit is contained in:
Nicola Soranzo
2022-09-06 12:12:21 +01:00
parent 2b450df90e 9f1d8d053b
commit 70b2ea429c
4 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/datatypes/interval.py
+4
View File
@@ -86,6 +86,7 @@ class Interval(Tabular):
MetadataElement(name="endCol", default=3, desc="End column", param=metadata.ColumnParameter)
MetadataElement(
name="strandCol",
default=0,
desc="Strand column (click box & select)",
param=metadata.ColumnParameter,
optional=True,
@@ -459,6 +460,7 @@ class Bed(Interval):
MetadataElement(name="endCol", default=3, desc="End column", param=metadata.ColumnParameter)
MetadataElement(
name="strandCol",
default=0,
desc="Strand column (click box & select)",
param=metadata.ColumnParameter,
optional=True,
@@ -687,6 +689,7 @@ class BedStrict(Bed):
MetadataElement(name="endCol", default=3, desc="End column", readonly=True, param=metadata.MetadataParameter)
MetadataElement(
name="strandCol",
default=0,
desc="Strand column (click box & select)",
readonly=True,
param=metadata.MetadataParameter,
@@ -1613,6 +1616,7 @@ class ENCODEPeak(Interval):
MetadataElement(name="endCol", default=3, desc="End column", param=metadata.ColumnParameter)
MetadataElement(
name="strandCol",
default=0,
desc="Strand column (click box & select)",
param=metadata.ColumnParameter,
optional=True,
lib/galaxy/tools/__init__.py
+1 -1
View File
@@ -1190,7 +1190,7 @@ class Tool(Dictifiable):
if getattr(self, "tool_shed", None):
tool_dir = Path(self.tool_dir)
for repo_dir in itertools.chain([tool_dir], tool_dir.parents):
if repo_dir.name == self.repository_name:
if repo_dir.name == self.repository_name and repo_dir.parent.name == self.installed_changeset_revision:
return str(repo_dir)
else:
log.error(f"Problem finding repository dir for tool '{self.id}'")