Skip to content

Commit cf2547d

Browse files
committed
Remove unused tags and node info support
1 parent afb585e commit cf2547d

File tree

6 files changed

+3
-245
lines changed

6 files changed

+3
-245
lines changed

_includes/package_body.html

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,7 @@ <h4>Third-Party Package</h4>
5050
<div class="panel-body">
5151
<table class="table table-condensed">
5252
<tr>
53-
<td style="width:100px;" class="text-right"><strong>Tags</strong></td>
54-
<td>
55-
{% assign n_tags = package.data.tags.size %}
56-
{% if n_tags > 0 %}
57-
{% for tag in package.data.tags %}<span class="label label-default">{{ tag }}</span> {% endfor %}
58-
{% else %}
59-
<em>No category tags.</em>
60-
{% endif %}
61-
</td>
62-
</tr>
63-
<tr>
64-
<td class="text-right"><strong>Version</strong></td>
53+
<td style="width:100px;" class="text-right"><strong>Version</strong></td>
6554
<td>{{ package.data.version }}</td>
6655
</tr>
6756
<tr>

_includes/repo_summary.html

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,6 @@
5252
{% endif %}</span>
5353
</td>
5454
</tr>
55-
<tr>
56-
<td class="text-right"><b>Tags</b></td>
57-
<td>
58-
{% assign n_tags = repo.tags.size %}
59-
{% if n_tags > 0 %}
60-
{% for tag in repo.tags %}<span class="label label-default">{{ tag }}</span> {% endfor %}
61-
{% else %}
62-
<em>No category tags.</em>
63-
{% endif %}
64-
</td>
65-
</tr>
6655
<tr>
6756
<td class="text-right"><b>Contributing</b></td>
6857
<td>

_plugins/rosindex_generator.rb

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -338,22 +338,6 @@ def extract_package(site, distro, repo, snapshot, checkout_path, path, pkg_type,
338338
# extract other standard exports
339339
deprecated = REXML::XPath.first(manifest_doc, "/package/export/deprecated/text()").to_s
340340

341-
# extract rosindex exports
342-
tags = REXML::XPath.each(manifest_doc, "/package/export/rosindex/tags/tag/text()").map { |t| t.to_s }
343-
nodes = REXML::XPath.each(manifest_doc, "/package/export/rosindex/nodes").map { |nodes|
344-
case nodes.attributes["format"]
345-
when "hdf"
346-
get_hdf(nodes.text)
347-
else
348-
REXML::XPath.each(manifest_doc, "/package/export/rosindex/nodes/node").map { |node|
349-
{
350-
'name' => REXML::XPath.first(node,'/name/text()').to_s,
351-
'description' => REXML::XPath.first(node,'/description/text()').to_s,
352-
'ros_api' => get_ros_api(REXML::XPath.first(node,'/description/api'))
353-
}
354-
}
355-
end
356-
}
357341

358342
# compute the relative path from the root of the repo to this directory
359343
package_relpath = Pathname.new(File.join(*path)).relative_path_from(Pathname.new(checkout_path))
@@ -454,9 +438,6 @@ def extract_package(site, distro, repo, snapshot, checkout_path, path, pkg_type,
454438
'dependants' => {},
455439
# exports
456440
'deprecated' => deprecated,
457-
# rosindex metadata
458-
'tags' => tags,
459-
'nodes' => nodes,
460441
# readme
461442
'readmes' => readmes,
462443
# changelog
@@ -570,12 +551,8 @@ def scrape_version(site, repo, distro, snapshot, vcs)
570551
# store this package in the repo snapshot
571552
snapshot.packages[package_name] = package
572553

573-
# collect tags from discovered packages
574-
repo.tags = Set.new(repo.tags).merge(package_data['tags']).to_a
575-
576554
# add this package to the global package dict
577555
@package_names[package_name].instances[repo.id] = repo
578-
@package_names[package_name].tags = Set.new(@package_names[package_name].tags).merge(package_data['tags']).to_a
579556

580557
# add this package as the default for this distro
581558
if @repo_names[repo.name].defaults[distro]
@@ -1136,7 +1113,7 @@ def generate(site)
11361113
'baseurl' => site.config['baseurl'],
11371114
'url' => File.join('/p',package_name)+"#"+distro,
11381115
'last_commit_time' => repo_snapshot.data['last_commit_time'],
1139-
'tags' => (p['tags'] + package_name.split('_')) * " ",
1116+
'tags' => (package_name.split('_')) * " ",
11401117
'package' => package_name,
11411118
'repo' => repo.name,
11421119
'core' => core,

contribute.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ easier for users to run your code. In order to release your repository's
3737
packages, follow the tutorials for the [bloom release automation
3838
tool](https://docs.ros.org/en/rolling/How-To-Guides/Releasing/Releasing-a-Package.html) on the ROS.org.
3939

40-
## Adding ROS Index Metadata
41-
42-
In addition to standard `README` formats, ROS Index also inspects ROS package
43-
manifest XML files for ROS Index-specific `<export>` tags in order to read
44-
additional metadata.
45-
46-
See [ROS Index Metadata]({{ "/contribute/metadata" | prepend: site.baseurl }}) for documentation on these tags.
4740

4841
## Opting out of Indexing
4942

contribute/metadata.md

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

help/package_list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The package name is split by underscore (_), and those individual terms are adde
4242

4343
These fields are additionally searched:
4444
- readme: The 'readme' file included in the package repository.
45-
- tags: These mostly contains the page name split by '_', so that for example the package with name "avt_vimbra_camera" would have tags 'avt', 'vimbra', and 'camera'. (A few packages have explicit tags defined, but most do not.)
45+
- tags: These mostly contains the page name split by '_', so that for example the package with name "avt_vimbra_camera" would have tags 'avt', 'vimbra', and 'camera'.
4646
- released: Is the package released? Has a value 'released' if released, otherwise empty.
4747

4848
### Example searches

0 commit comments

Comments
 (0)