[med-svn] [Git][med-team/q2templates][master] 3 commits: Skip build-time test for npm-generated matryoshka assets
Andreas Tille (@tille)
gitlab at salsa.debian.org
Mon Nov 2 09:03:40 GMT 2026
Andreas Tille pushed to branch master at Debian Med / q2templates
Commits:
c31e0c81 by Andreas Tille at 2026-11-02T09:15:22+01:00
Skip build-time test for npm-generated matryoshka assets
- - - - -
7f299805 by Andreas Tille at 2026-11-02T09:41:58+01:00
Migrate templates to Bootstrap 5 (Closes: #1088514)
- - - - -
bae6aec2 by Andreas Tille at 2026-11-02T09:44:23+01:00
Upload to experimental
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/bootstrap5.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-q2templates (2026.10.0-1) UNRELEASED; urgency=medium
+q2templates (2026.10.0-1) experimental; urgency=medium
* Team upload.
* d/watch: version=5
@@ -9,8 +9,12 @@ q2templates (2026.10.0-1) UNRELEASED; urgency=medium
* Reformat the Last-Update date as ISO YYYY-MM-DD.
* Replace FSF postal address with a reference to
https://www.gnu.org/licenses/.
+ * Skip the build-time test for the matryoshka assets, which are generated
+ with npm and are not part of the upstream source tarball.
+ * Migrate the templates to Bootstrap 5 and depend on libjs-bootstrap5
+ instead of the unmaintained libjs-bootstrap. (Closes: #1088514)
- -- Andreas Tille <tille at debian.org> Mon, 02 Nov 2026 08:27:14 +0100
+ -- Andreas Tille <tille at debian.org> Mon, 02 Nov 2026 09:43:27 +0100
q2templates (2024.5.0+ds-4) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -22,7 +22,7 @@ Homepage: https://qiime2.org/
Package: q2templates
Architecture: all
Depends:
- libjs-bootstrap,
+ libjs-bootstrap5,
libjs-jquery,
node-normalize.css,
python3-jinja2,
=====================================
debian/patches/bootstrap5.patch
=====================================
@@ -0,0 +1,63 @@
+Description: Migrate templates to Bootstrap 5
+ Bootstrap 5 requires .nav-item on the list item and .nav-link on the
+ anchor, and the active state belongs on the .nav-link rather than on the
+ list item. Update the tab templates and the parent frame tab-switching
+ JavaScript accordingly.
+Author: Andreas Tille <tille at debian.org>
+Last-Update: 2026-11-02
+Assisted-By: DeepSeek V4.1 Flash Free
+
+diff --git a/q2templates/templates/assets/js/parent.js b/q2templates/templates/assets/js/parent.js
+index 2e2dedf..6baf077 100644
+--- a/q2templates/templates/assets/js/parent.js
++++ b/q2templates/templates/assets/js/parent.js
+@@ -13,9 +13,10 @@ function frameLoad(event) {
+ }
+
+ function toggleClass() {
+- if (document.querySelector('.active').id != this.id) {
+- document.querySelector('.active').className = '';
+- this.className = 'active';
++ const active = document.querySelector('.nav-link.active');
++ if (active.parentElement.id != this.id) {
++ active.classList.remove('active');
++ this.querySelector('.nav-link').classList.add('active');
+ frame.height = '0px';
+ frame.contentWindow.location.replace(frameSrc[this.id]);
+ }
+diff --git a/q2templates/templates/tab-parent.html b/q2templates/templates/tab-parent.html
+index bcc8817..d999507 100644
+--- a/q2templates/templates/tab-parent.html
++++ b/q2templates/templates/tab-parent.html
+@@ -23,9 +23,13 @@
+ </div>
+ <div class="row">
+ <ul class="nav nav-tabs">
+- <li id="{{ tabs[0].url.split('.')[0] }}" class="active"><a href="#">{{ tabs[0].title }}</a></li>
++ <li id="{{ tabs[0].url.split('.')[0] }}" class="nav-item">
++ <a class="nav-link active" href="#">{{ tabs[0].title }}</a>
++ </li>
+ {% for tab in tabs[1:] %}
+- <li id="{{ tab.url.split('.')[0] }}"><a href="#">{{ tab.title }}</a></li>
++ <li id="{{ tab.url.split('.')[0] }}" class="nav-item">
++ <a class="nav-link" href="#">{{ tab.title }}</a>
++ </li>
+ {% endfor %}
+ </ul>
+ </div>
+diff --git a/q2templates/templates/tabbed.html b/q2templates/templates/tabbed.html
+index 3a297f9..698b138 100644
+--- a/q2templates/templates/tabbed.html
++++ b/q2templates/templates/tabbed.html
+@@ -6,8 +6,9 @@
+ <div class="col-lg-12">
+ <ul class="nav nav-tabs">
+ {% for tab in tabs %}
+- <li class="{% if self._TemplateReference__context.name == tab.url %}active{% endif %}">
+- <a href="{{ tab.url }}">
++ <li class="nav-item">
++ <a href="{{ tab.url }}"
++ class="nav-link{% if self._TemplateReference__context.name == tab.url %} active{% endif %}">
+ {{ tab.title }}
+ </a>
+ </li>
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
jquery_remove_version.patch
+bootstrap5.patch
=====================================
debian/rules
=====================================
@@ -3,23 +3,24 @@
# DH_VERBOSE := 1
export PYBUILD_AFTER_INSTALL=\
- ln -s /usr/share/javascript/bootstrap/js/bootstrap.min.js \
+ ln -s /usr/share/bootstrap-html/js/bootstrap.bundle.min.js \
{destdir}/{install_dir}/q2templates/templates/assets/js/bootstrap.min.js; \
ln -s /usr/share/javascript/jquery/jquery.min.js \
{destdir}/{install_dir}/q2templates/templates/assets/js/jquery.min.js; \
- ln -s /usr/share/javascript/bootstrap/css/bootstrap.min.css \
+ ln -s /usr/share/bootstrap-html/css/bootstrap.min.css \
{destdir}/{install_dir}/q2templates/templates/assets/css/bootstrap.min.css; \
ln -s /usr/share/javascript/normalize.css/normalize.css \
- {destdir}/{install_dir}/q2templates/templates/assets/css/normalize.css; \
- ln -s /usr/share/javascript/bootstrap/fonts \
- {destdir}/{install_dir}/q2templates/templates/assets/fonts
+ {destdir}/{install_dir}/q2templates/templates/assets/css/normalize.css
%:
dh $@ --buildsystem=pybuild
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- dh_auto_test -- -s custom --test-args="cd {build_dir}; pytest"
+# The matryoshka assets are generated by `make build-reports` using npm and
+# are not shipped in the upstream source tarball. Skip the corresponding
+# test since those generated assets are not available during a Debian build.
+ dh_auto_test -- -s custom --test-args="cd {build_dir}; pytest --ignore=q2templates/reports/tests/test_reports.py"
endif
override_dh_auto_clean:
View it on GitLab: https://salsa.debian.org/med-team/q2templates/-/compare/ef8c6f402a7cde6bf5ab4566ce4535a449e5f3d9...bae6aec2e69c96b40b798d423bd9e472a22d325e
--
View it on GitLab: https://salsa.debian.org/med-team/q2templates/-/compare/ef8c6f402a7cde6bf5ab4566ce4535a449e5f3d9...bae6aec2e69c96b40b798d423bd9e472a22d325e
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261102/73ecc4d3/attachment-0001.htm>
More information about the debian-med-commit
mailing list