Skip to content

Commit 47fd445

Browse files
committed
Remove trackster traces completely?
1 parent 606a394 commit 47fd445

File tree

15 files changed

+9
-234
lines changed

15 files changed

+9
-234
lines changed

lib/galaxy/app_unittest_utils/galaxy_mock.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@ def user_vault(self):
407407

408408

409409
class MockVisualizationsRegistry:
410-
BUILT_IN_VISUALIZATIONS = ["trackster"]
411410

412411
def get_visualizations(self, trans, target):
413412
return []

lib/galaxy/config/sample/galaxy.yml.sample

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,8 +855,7 @@ galaxy:
855855
# <tool_data_path>.
856856
#builds_file_path: shared/ucsc/builds.txt
857857

858-
# Directory where chrom len files are kept, currently mainly used by
859-
# trackster.
858+
# Directory where chrom len files are kept.
860859
# The value of this option will be resolved with respect to
861860
# <tool_data_path>.
862861
#len_file_path: shared/ucsc/chrom

lib/galaxy/config/sample/job_conf.sample.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,11 +1156,6 @@ tools:
11561156
id: baz
11571157
handler: special_handlers
11581158
environment: bigmem
1159-
-
1160-
# legacy trackerster parameter for tool mapping
1161-
id: foo
1162-
handler: handler0
1163-
source: trackster
11641159
-
11651160
# Classes can be used to map groups of tools - the current classes include
11661161
# - local (these special tools that aren't parameterized for remote execution - expression tools, upload, etc..)

lib/galaxy/config/sample/job_conf.xml.sample_advanced

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,9 +1232,6 @@
12321232
<tool id="longbar" destination="dynamic" resources="all" />
12331233
<!-- Pick a handler randomly from those declaring this tag. -->
12341234
<tool id="baz" handler="special_handlers" destination="bigmem"/>
1235-
<tool id="foo" handler="handler0">
1236-
<param id="source">trackster</param>
1237-
</tool>
12381235
</tools>
12391236
<limits>
12401237
<!-- Certain limits can be defined. The 'concurrent_jobs' limits all

lib/galaxy/config/schemas/config_schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ mapping:
765765
default: shared/ucsc/chrom
766766
required: false
767767
desc: |
768-
Directory where chrom len files are kept, currently mainly used by trackster.
768+
Directory where chrom len files are kept.
769769
770770
The value of this option will be resolved with respect to <tool_data_path>.
771771

lib/galaxy/datatypes/_schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class DatatypeVisualizationMapping(BaseModel):
159159
..., # Mark this field as required
160160
title="Visualization",
161161
description="The visualization plugin to use",
162-
examples=["igv", "trackster", "vitessce"],
162+
examples=["igv", "vitessce"],
163163
)
164164

165165

lib/galaxy/tool_util/toolbox/filters/__init__.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ def __init__(self, toolbox):
1717
self.toolbox = toolbox
1818

1919
# Prepopulate dict containing filters that are always checked,
20-
# other filters that get checked depending on context (e.g. coming from
21-
# trackster or no user found are added in build filters).
20+
# other filters that get checked depending on context.
2221
self.default_filters = dict(tool=[_not_hidden, _handle_authorization], section=[], label=[])
2322
# Add dynamic filters to these default filters.
2423
config = toolbox.app.config
@@ -48,8 +47,6 @@ def build_filters(self, trans, **kwds):
4847
if category:
4948
validate = getattr(trans.app.config, f"user_tool_{category}_filters", [])
5049
self.__init_filters(category, user_filters, filters, validate=validate)
51-
if kwds.get("trackster", False):
52-
filters["tool"].append(_has_trackster_conf)
5350

5451
return filters
5552

@@ -104,6 +101,3 @@ def _handle_authorization(context, tool):
104101
return False
105102
return True
106103

107-
108-
def _has_trackster_conf(context, tool):
109-
return tool.trackster_conf

lib/galaxy/tool_util/xsd/galaxy.xsd

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ the tool menu immediately following the hyperlink for the tool (based on the
139139
<xs:element name="code" type="Code" minOccurs="0"/>
140140
<xs:element name="uihints" type="UIhints" minOccurs="0"/>
141141
<xs:element name="options" type="Options" minOccurs="0"/>
142-
<xs:element name="trackster_conf" type="TracksterConf" minOccurs="0"/>
143142
<xs:element name="citations" type="Citations" minOccurs="0"/>
144143
</xs:all>
145144
<xs:attribute name="id" type="xs:string" use="required">
@@ -1047,29 +1046,6 @@ The content of ``stdout`` and ``stderr`` are strings containing the output of th
10471046
</xs:annotation>
10481047
</xs:attribute>
10491048
</xs:complexType>
1050-
<xs:complexType name="TracksterConf">
1051-
<xs:annotation>
1052-
<xs:documentation xml:lang="en">This directive is used to specify some rarely modified trackster options.</xs:documentation>
1053-
</xs:annotation>
1054-
<xs:sequence>
1055-
<xs:element name="action" type="TracksterAction" minOccurs="0" maxOccurs="unbounded"/>
1056-
</xs:sequence>
1057-
</xs:complexType>
1058-
<xs:complexType name="TracksterAction">
1059-
<xs:annotation>
1060-
<xs:documentation xml:lang="en"/>
1061-
</xs:annotation>
1062-
<xs:attribute name="name" type="xs:string">
1063-
<xs:annotation>
1064-
<xs:documentation xml:lang="en"/>
1065-
</xs:annotation>
1066-
</xs:attribute>
1067-
<xs:attribute name="output_name" type="xs:string">
1068-
<xs:annotation>
1069-
<xs:documentation xml:lang="en"/>
1070-
</xs:annotation>
1071-
</xs:attribute>
1072-
</xs:complexType>
10731049
<xs:complexType name="Tests">
10741050
<xs:annotation gxdocs:best_practices="tests">
10751051
<xs:documentation xml:lang="en"><![CDATA[

lib/galaxy/tools/__init__.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,6 @@ def parse(self, tool_source: ToolSource, guid: Optional[str] = None, dynamic: bo
14941494
self.edam_operations = None
14951495
self.edam_topics = None
14961496

1497-
self.__parse_trackster_conf(tool_source)
14981497
# Record macro paths so we can reload a tool if any of its macro has changes
14991498
self._macro_paths = tool_source.macro_paths
15001499
self.ports = tool_source.parse_interactivetool()
@@ -1555,15 +1554,6 @@ def __parse_config_files(self, tool_source: ToolSource):
15551554
self.config_files.extend(tool_source.parse_template_configfiles())
15561555
self.config_files.extend(tool_source.parse_file_sources())
15571556

1558-
def __parse_trackster_conf(self, tool_source):
1559-
self.trackster_conf = None
1560-
if not hasattr(tool_source, "root"):
1561-
return
1562-
1563-
# Trackster configuration.
1564-
if (trackster_conf := tool_source.root.find("trackster_conf")) is not None:
1565-
self.trackster_conf = TracksterConfig.parse(trackster_conf)
1566-
15671557
def parse_tests(self):
15681558
if self.tool_source:
15691559
test_descriptions = parse_tool_test_descriptions(self.tool_source, self.id)
@@ -4598,20 +4588,6 @@ def _rerun_remap_job_id(trans, incoming, tool_id: Optional[str]) -> Optional[int
45984588
return rerun_remap_job_id
45994589

46004590

4601-
class TracksterConfig:
4602-
"""Trackster configuration encapsulation."""
4603-
4604-
def __init__(self, actions):
4605-
self.actions = actions
4606-
4607-
@staticmethod
4608-
def parse(root):
4609-
actions = []
4610-
for action_elt in root.findall("action"):
4611-
actions.append(SetParamAction.parse(action_elt))
4612-
return TracksterConfig(actions)
4613-
4614-
46154591
class SetParamAction:
46164592
"""Set parameter action."""
46174593

lib/galaxy/visualization/data_providers/genome.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,14 +1629,6 @@ def package_gff_feature(feature, no_detail=False, filter_cols=None) -> PAYLOAD_L
16291629
feature.end,
16301630
]
16311631

1632-
# HACK: ignore interval with name 'transcript' from feature.
1633-
# Cufflinks puts this interval in each of its transcripts,
1634-
# and they mess up trackster by covering the feature's blocks.
1635-
# This interval will always be a feature's first interval,
1636-
# and the GFF's third column is its feature name.
1637-
feature_intervals = feature.intervals
1638-
if feature.intervals[0].fields[2] == "transcript":
1639-
feature_intervals = feature.intervals[1:]
16401632
# Add blocks.
16411633
block_sizes = [(interval.end - interval.start) for interval in feature_intervals]
16421634
block_starts = [(interval.start - feature.start) for interval in feature_intervals]

0 commit comments

Comments
 (0)