v0.17 release prep (#264)

* Bump testing/linting dependency versions
* Bump GHA action versions
* Update chooser tabs code to use new tabs controller for Wagtail 7.1+
* Update CHANGELOG and bump version to 0.17

Author: zerolab

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
             pypi.org:443
             api.github.com:443
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -55,7 +55,7 @@ jobs:
       # Mandatory for trusted publishing
       id-token: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
 
       - name: 🚀 Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/ruff.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         persist-credentials: false
 
-    - run: python -Im pip install --user ruff==0.8.2
+    - run: python -Im pip install --user ruff==0.12.9
 
     - name: Run ruff
       working-directory: ./src

.github/workflows/test.yml

@@ -42,7 +42,7 @@ jobs:
             github.com:443
             pypi.org:443
             api.github.com:443
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - name: 🐍 Set up Python ${{ matrix.python-version }}
@@ -85,7 +85,7 @@ jobs:
             github.com:443
             pypi.org:443
             api.github.com:443
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -97,7 +97,7 @@ jobs:
       - run: python -Im pip install --upgrade coverage
 
       - name: Download coverage data
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: coverage-data-*
           merge-multiple: true

.pre-commit-config.yaml

@@ -19,8 +19,8 @@ repos:
     - id: end-of-file-fixer
     - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.8.2'  # keep in sync with .github/workflows/ruff.yml
+    rev: 'v0.12.9'  # keep in sync with .github/workflows/ruff.yml
     hooks:
-      - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-check
+        args: [--fix]
       - id: ruff-format

CHANGELOG.md

@@ -2,10 +2,21 @@
 
 ## [Unreleased]
 
+## [0.17.0] - 2025-08-20
+
 ### Added
 
 - Support for Wagtail 7.1 ([#262](https://github.com/torchbox/wagtailmedia/pull/262)) @damwaingames
 
+### Fixed
+
+- Pagination when using typed choosers ([#260](https://github.com/torchbox/wagtailmedia/pull/260)) @WilliamHenryTanza
+
+### Changed
+
+- Use the new Tabs controller with Wagtail 7.1  @zerolab
+  This no longer includes the modified `tabs.js` as a workaround.
+
 ## [0.16.0] - 2025-05-06
 
 ### Added
@@ -329,6 +340,7 @@ Initial release
 ---
 
 [unreleased]: https://github.com/torchbox/wagtailmedia/compare/v0.16.0...HEAD
+[0.17.0]: https://github.com/torchbox/wagtailmedia/compare/v0.16.0...v0.17.0
 [0.16.0]: https://github.com/torchbox/wagtailmedia/compare/v0.15.2...v0.16.0
 [0.15.2]: https://github.com/torchbox/wagtailmedia/compare/v0.15.1...v0.15.2
 [0.15.1]: https://github.com/torchbox/wagtailmedia/compare/v0.15.0...v0.15.1

pyproject.toml

@@ -33,10 +33,11 @@ dependencies = [
 
 [project.optional-dependencies]
 testing = [
-    "coverage>=7.8.0",
+    "coverage>=7.10.0",
+    "tox>=4.28.4",
 ]
 linting = [
-    "pre-commit>=4.2.0",
+    "pre-commit>=4.3.0",
 ]
 
 [project.urls]

src/wagtailmedia/__init__.py

@@ -1 +1 @@
-__version__ = "0.16.0"
+__version__ = "0.17.0"

src/wagtailmedia/templates/wagtailmedia/chooser/chooser.html

@@ -1,9 +1,10 @@
 {% load i18n wagtailadmin_tags %}
 {% include "wagtailadmin/shared/header.html" with title=title icon=icon merged=1 %}
 
-{# TODO: drop data-wmtabs and the tabs.js include when a better tabs framework is in place #}
-{# See https://github.com/wagtail/wagtail/issues/8408. #}
-<div class="w-tabs wagtailmedia-tabs" data-tabs data-tabs-animate data-tabs-disable-url data-wm-tabs>
+{# TODO: drop data-wmtabs and the tabs.js include once we drop support for Wagtail < 7.1 #}
+<div class="w-tabs wagtailmedia-tabs"
+     data-controller="w-tabs" data-w-tabs-active-class="animate-in"
+     data-tabs data-tabs-animate data-tabs-disable-url data-wm-tabs>
     {% if uploadforms %}
         {# Both auth and video forms are powered by the same media form, so use one of them #}
         {% if uploadforms.video %}
@@ -16,7 +17,10 @@
 
         <div class="w-tabs__wrapper w-overflow-hidden">
             {# Using nice-padding and full width class until the modal header is restyled #}
-            <div role="tablist" class="w-tabs__list w-w-full nice-padding">
+            <div role="tablist"
+                 class="w-tabs__list w-w-full nice-padding"
+                 data-action="keydown.right->w-tabs#selectNext keydown.left->w-tabs#selectPrevious keydown.home->w-tabs#selectFirst keydown.end->w-tabs#selectLast"
+            >
                 {% trans "Search" as search_text %}
                 {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id='search' title=search_text %}
                 {% if uploadforms.audio %}
@@ -40,7 +44,7 @@
     {% endif %}
 
     <div class="tab-content">
-        <section id="tab-search" class="w-tabs__panel" role="tabpanel" aria-labelledby="tab-label-search">
+        <section id="tab-search" class="w-tabs__panel" role="tabpanel" data-w-tabs-target="panel" aria-labelledby="tab-label-search">
             <form action="{{ chooser_url }}" method="GET" role="search" class="media-search search-bar" novalidate data-chooser-modal-search>
                 <ul class="fields">
                     {% for field in searchform %}
@@ -66,7 +70,7 @@ <h3>{% trans 'Popular tags' %}</h3>
         </section>
         {% if uploadforms %}
             {% for form_type, uploadform in uploadforms.items %}
-            <section id="tab-upload-{{ form_type }}" class="w-tabs__panel" role="tabpanel" aria-labelledby="tab-label-upload-{{ form_type }}" hidden>
+            <section id="tab-upload-{{ form_type }}" class="w-tabs__panel" role="tabpanel" data-w-tabs-target="panel" aria-labelledby="tab-label-upload-{{ form_type }}" hidden>
                 {% include "wagtailadmin/shared/non_field_errors.html" with form=uploadform %}
                 <form class="media-upload" action="{% url 'wagtailmedia:chooser_upload' form_type %}" method="POST" enctype="multipart/form-data" novalidate>
                     {% csrf_token %}

src/wagtailmedia/widgets.py

@@ -45,13 +45,13 @@ def render_js_init(self, id_, name, value):
 
     @property
     def media(self):
-        return forms.Media(
-            js=[
-                "wagtailmedia/js/tabs.js",
-                "wagtailmedia/js/media-chooser-modal.js",
-                "wagtailmedia/js/media-chooser.js",
-            ]
-        )
+        tab_js = ["wagtailmedia/js/tabs.js"] if WAGTAIL_VERSION >= (7, 1) else []
+        js = [
+            *tab_js,
+            "wagtailmedia/js/media-chooser-modal.js",
+            "wagtailmedia/js/media-chooser.js",
+        ]
+        return forms.Media(js=js)
 
 
 class AdminAudioChooser(AdminMediaChooser):

tests/test_compare.py

@@ -75,8 +75,8 @@ def test_has_changed(self):
         diff = comparison.htmldiff()
         self.assertHTMLEqual(
             diff,
-            f'<div class="comparison--media deletion">{ format_audio_html(self.audio_a) }</div>'
-            f'<div class="comparison--media addition">{ format_audio_html(self.audio_b) }</div>',
+            f'<div class="comparison--media deletion">{format_audio_html(self.audio_a)}</div>'
+            f'<div class="comparison--media addition">{format_audio_html(self.audio_b)}</div>',
         )
         self.assertIsInstance(diff, SafeString)