wagtailstreamforms 5.2.5__tar.gz → 5.3.0__tar.gz

{wagtailstreamforms-5.2.5 → wagtailstreamforms-5.3.0}/PKG-INFO

@@ -1,26 +1,39 @@
 Metadata-Version: 2.4
 Name: wagtailstreamforms
-Version: 5.2.5
+Version: 5.3.0
+Summary: Wagtail forms in a streamfield
 Author-email: Lab Digital BV <info@labdigital.nl>
-License: Proprietary
-Classifier: License :: Other/Proprietary License
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/labd/wagtailstreamforms
+Project-URL: Documentation, https://wagtailstreamforms.readthedocs.io/
+Project-URL: Changelog, https://github.com/labd/wagtailstreamforms/blob/master/CHANGELOG.rst
+Project-URL: Issues, https://github.com/labd/wagtailstreamforms/issues
+Keywords: wagtail,streamfield,forms
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 5.2
+Classifier: Framework :: Django :: 6.0
+Classifier: Framework :: Django :: 6.1
+Classifier: Framework :: Wagtail
+Classifier: Framework :: Wagtail :: 7
+Classifier: Framework :: Wagtail :: 8
+Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: wagtail<8.0,>=6.0
+Requires-Dist: wagtail<9.0,>=7.0
 Requires-Dist: Unidecode<2.0,>=0.04.14
-Requires-Dist: wagtail-generic-chooser>=0.7.0
-Requires-Dist: wagtail-modeladmin>=2.2.0
-Requires-Dist: django-recaptcha>=4.0.0
-Requires-Dist: psycopg>=3.2.9
-Requires-Dist: tox>=4.26.0
+Requires-Dist: wagtail-generic-chooser>=0.8
+Requires-Dist: wagtail-modeladmin>=2.5.0
 Dynamic: license-file
 
 Wagtail StreamForms
@@ -34,6 +47,33 @@ of file fields. Form submissions are controlled by hooks that you can add that p
 Templates can be created which will then appear as choices when you build your form,
 allowing you to display and submit a form however you want.
 
+Installation
+------------
+
+.. code:: bash
+
+    $ pip install wagtailstreamforms
+
+or, in a project managed with `uv <https://docs.astral.sh/uv/>`_:
+
+.. code:: bash
+
+    $ uv add wagtailstreamforms
+
+Then follow the `installation guide <https://wagtailstreamforms.readthedocs.io/en/latest/installation.html>`_.
+
+Compatibility
+-------------
+
+==================  ==============  ==========================  ===============
+wagtailstreamforms  Wagtail         Django                      Python
+==================  ==============  ==========================  ===============
+5.3                 7.0 - 8.x       5.2, 6.0, 6.1 [#django]_    3.10 - 3.14
+5.1 - 5.2           6.0 - 7.x       as supported by Wagtail     3.9+
+==================  ==============  ==========================  ===============
+
+.. [#django] Whichever of these the installed Wagtail version supports. Django 6.x requires Python 3.12+.
+
 Backwards Compatibility
 -----------------------
 
@@ -90,6 +130,21 @@ Screenshots
 
    Form Fields Selection
 
+Development
+-----------
+
+The project is managed with `uv <https://docs.astral.sh/uv/>`_.
+
+.. code:: bash
+
+    $ git clone https://github.com/labd/wagtailstreamforms.git
+    $ cd wagtailstreamforms
+    $ make install   # uv sync --all-groups
+    $ make test      # run the test suite against the locked versions
+    $ make tox       # run the full Python/Django/Wagtail matrix via tox-uv
+    $ make format    # ruff
+    $ make docs      # build the Sphinx documentation
+
 Example site with docker
 ------------------------
 

wagtailstreamforms-5.2.5/wagtailstreamforms.egg-info/PKG-INFO → wagtailstreamforms-5.3.0/README.rst

@@ -1,28 +1,3 @@
-Metadata-Version: 2.4
-Name: wagtailstreamforms
-Version: 5.2.5
-Author-email: Lab Digital BV <info@labdigital.nl>
-License: Proprietary
-Classifier: License :: Other/Proprietary License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: wagtail<8.0,>=6.0
-Requires-Dist: Unidecode<2.0,>=0.04.14
-Requires-Dist: wagtail-generic-chooser>=0.7.0
-Requires-Dist: wagtail-modeladmin>=2.2.0
-Requires-Dist: django-recaptcha>=4.0.0
-Requires-Dist: psycopg>=3.2.9
-Requires-Dist: tox>=4.26.0
-Dynamic: license-file
-
 Wagtail StreamForms
 ===================
 
@@ -34,6 +9,33 @@ of file fields. Form submissions are controlled by hooks that you can add that p
 Templates can be created which will then appear as choices when you build your form,
 allowing you to display and submit a form however you want.
 
+Installation
+------------
+
+.. code:: bash
+
+    $ pip install wagtailstreamforms
+
+or, in a project managed with `uv <https://docs.astral.sh/uv/>`_:
+
+.. code:: bash
+
+    $ uv add wagtailstreamforms
+
+Then follow the `installation guide <https://wagtailstreamforms.readthedocs.io/en/latest/installation.html>`_.
+
+Compatibility
+-------------
+
+==================  ==============  ==========================  ===============
+wagtailstreamforms  Wagtail         Django                      Python
+==================  ==============  ==========================  ===============
+5.3                 7.0 - 8.x       5.2, 6.0, 6.1 [#django]_    3.10 - 3.14
+5.1 - 5.2           6.0 - 7.x       as supported by Wagtail     3.9+
+==================  ==============  ==========================  ===============
+
+.. [#django] Whichever of these the installed Wagtail version supports. Django 6.x requires Python 3.12+.
+
 Backwards Compatibility
 -----------------------
 
@@ -90,6 +92,21 @@ Screenshots
 
    Form Fields Selection
 
+Development
+-----------
+
+The project is managed with `uv <https://docs.astral.sh/uv/>`_.
+
+.. code:: bash
+
+    $ git clone https://github.com/labd/wagtailstreamforms.git
+    $ cd wagtailstreamforms
+    $ make install   # uv sync --all-groups
+    $ make test      # run the test suite against the locked versions
+    $ make tox       # run the full Python/Django/Wagtail matrix via tox-uv
+    $ make format    # ruff
+    $ make docs      # build the Sphinx documentation
+
 Example site with docker
 ------------------------
 

wagtailstreamforms-5.3.0/pyproject.toml

@@ -0,0 +1,89 @@
+[tool.djlint]
+format_css = false
+ignore = "H031"
+
+[tool.ruff]
+line-length = 99
+extend-exclude = ["**/migrations/"]
+lint.select = ["E4", "E7", "E9", "F", "I"]
+lint.extend-ignore = ["F405", "E731"]
+
+[tool.pytest.ini_options]
+DJANGO_SETTINGS_MODULE = "tests.settings"
+testpaths = ["tests/"]
+django_find_project = false
+addopts = ["--nomigrations"]
+filterwarnings = [
+    "ignore::DeprecationWarning",
+    "ignore::PendingDeprecationWarning",
+]
+
+[dependency-groups]
+dev = [
+    "django-recaptcha>=4.0.0",
+    "pre-commit",
+    "psycopg>=3.2.9",
+    "pytest",
+    "pytest-django",
+    "ruff",
+    "tox>=4.26.0",
+    "tox-uv",
+]
+docs = [
+    "karma-sphinx-theme>=0.0.8",
+    # karma-sphinx-theme uses the "style" template field that Sphinx 7 removed
+    "sphinx<7",
+    "sphinx-autobuild",
+]
+
+[tool.setuptools.packages.find]
+include = ["wagtailstreamforms*"]
+exclude = ["tests*", "docs*"]
+
+
+[project]
+name = "wagtailstreamforms"
+version = "5.3.0"
+description = "Wagtail forms in a streamfield"
+authors = [{ name = "Lab Digital BV", email = "info@labdigital.nl" }]
+dependencies = [
+    "wagtail>=7.0,<9.0",
+    "Unidecode>=0.04.14,<2.0",
+    "wagtail-generic-chooser>=0.8",
+    "wagtail-modeladmin>=2.5.0",
+]
+requires-python = ">=3.10"
+readme = "README.rst"
+license = "MIT"
+license-files = ["LICENSE"]
+keywords = ["wagtail", "streamfield", "forms"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Framework :: Django",
+    "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
+    "Framework :: Django :: 6.1",
+    "Framework :: Wagtail",
+    "Framework :: Wagtail :: 7",
+    "Framework :: Wagtail :: 8",
+    "Topic :: Internet :: WWW/HTTP :: Site Management",
+]
+
+[project.urls]
+Homepage = "https://github.com/labd/wagtailstreamforms"
+Documentation = "https://wagtailstreamforms.readthedocs.io/"
+Changelog = "https://github.com/labd/wagtailstreamforms/blob/master/CHANGELOG.rst"
+Issues = "https://github.com/labd/wagtailstreamforms/issues"
+
+[build-system]
+requires = ["setuptools>=77"]
+build-backend = "setuptools.build_meta"

wagtailstreamforms-5.3.0/wagtailstreamforms/__init__.py

@@ -0,0 +1,7 @@
+from importlib.metadata import PackageNotFoundError, version
+
+try:
+    __version__ = version("wagtailstreamforms")
+except PackageNotFoundError:  # pragma: no cover
+    # running from a source checkout that was never installed
+    __version__ = "0.0.0"

{wagtailstreamforms-5.2.5 → wagtailstreamforms-5.3.0}/wagtailstreamforms/blocks.py

@@ -1,5 +1,6 @@
 import uuid
 
+from django.utils.functional import cached_property
 from django.utils.safestring import SafeText, mark_safe
 from django.utils.translation import gettext_lazy as _
 from wagtail import blocks
@@ -13,13 +14,13 @@ class InfoBlock(blocks.CharBlock):
 
 
 class FormChooserBlock(blocks.ChooserBlock):
-    @property
+    @cached_property
     def target_model(self):
         from .models import Form
 
         return Form
 
-    @property
+    @cached_property
     def widget(self):
         from .wagtail_hooks import WagtailStreamFormsChooser
 

{wagtailstreamforms-5.2.5 → wagtailstreamforms-5.3.0}/wagtailstreamforms/management/commands/prunesubmissions.py

@@ -12,7 +12,7 @@ class Command(BaseCommand):
         parser.add_argument("days_to_keep", type=int)
 
     def get_queryset(self, date):
-        return FormSubmission.objects.filter(submit_time__lt=date)
+        return FormSubmission.objects.filter(submit_time__date__lt=date)
 
     def handle(self, *args, **options):
         keep_from_date = datetime.today().date() - timedelta(days=options["days_to_keep"])

{wagtailstreamforms-5.2.5 → wagtailstreamforms-5.3.0}/wagtailstreamforms/models/form.py

@@ -3,7 +3,6 @@ import uuid
 from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from wagtail import VERSION as WAGTAIL_VERSION
 from wagtail.admin.panels import (
     FieldPanel,
     MultiFieldPanel,
@@ -141,8 +140,12 @@ class AbstractForm(models.Model):
         """Returns a list of tuples with (field_name, field_label)."""
 
         data_fields = [("submit_time", _("Submission date"))]
+        # same key as BaseField.get_formfield_name, so fields with a custom name show their data
         data_fields += [
-            (get_slug_from_string(field["value"]["label"]), field["value"]["label"])
+            (
+                field["value"].get("name") or get_slug_from_string(field["value"]["label"]),
+                field["value"]["label"],
+            )
             for field in self.get_form_fields()
         ]
         if getattr(settings, "WAGTAILSTREAMFORMS_SHOW_FORM_REFERENCE", False):
@@ -163,10 +166,7 @@ class AbstractForm(models.Model):
     def get_form_fields(self):
         """Returns the form field's stream data."""
 
-        if WAGTAIL_VERSION >= (2, 12):
-            form_fields = self.fields.raw_data
-        else:
-            form_fields = self.fields.stream_data
+        form_fields = self.fields.raw_data
         for fn in hooks.get_hooks("construct_submission_form_fields"):
             form_fields = fn(form_fields)
         return form_fields

{wagtailstreamforms-5.2.5 → wagtailstreamforms-5.3.0}/wagtailstreamforms/wagtail_hooks.py

@@ -4,10 +4,10 @@ from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.urls import include, path, reverse
 from django.utils.translation import gettext_lazy as _
+from generic_chooser.views import ModelChooserViewSet
+from generic_chooser.widgets import AdminChooser
 from wagtail import hooks
 from wagtail.admin import messages as wagtail_messages
-from wagtail.admin.viewsets.chooser import ChooserViewSet
-from wagtail.admin.widgets import BaseChooser
 from wagtail_modeladmin.helpers import AdminURLHelper, ButtonHelper
 from wagtail_modeladmin.options import ModelAdmin, modeladmin_register
 from wagtail_modeladmin.views import (
@@ -232,19 +232,19 @@ def process_form(page, request, *args, **kwargs):
                 )
 
 
-class WagtailStreamFormsChooserViewSet(ChooserViewSet):
+class WagtailStreamFormsChooserViewSet(ModelChooserViewSet):
     icon = "form"
     model = Form
     page_title = _("Choose a form")
     per_page = 10
 
 
-class WagtailStreamFormsChooser(BaseChooser):
+class WagtailStreamFormsChooser(AdminChooser):
     choose_one_text = _("Choose a form")
     choose_another_text = _("Choose another form")
     link_to_chosen_text = _("Edit this form")
     model = Form
-    chooser_modal_url_name = "wagtailstreamforms_chooser:choose"
+    choose_modal_url_name = "wagtailstreamforms_chooser:choose"
     icon = "form"
     template = "generic_chooser/widgets/chooser.html"
 

wagtailstreamforms-5.2.5/README.rst → wagtailstreamforms-5.3.0/wagtailstreamforms.egg-info/PKG-INFO

@@ -1,3 +1,41 @@
+Metadata-Version: 2.4
+Name: wagtailstreamforms
+Version: 5.3.0
+Summary: Wagtail forms in a streamfield
+Author-email: Lab Digital BV <info@labdigital.nl>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/labd/wagtailstreamforms
+Project-URL: Documentation, https://wagtailstreamforms.readthedocs.io/
+Project-URL: Changelog, https://github.com/labd/wagtailstreamforms/blob/master/CHANGELOG.rst
+Project-URL: Issues, https://github.com/labd/wagtailstreamforms/issues
+Keywords: wagtail,streamfield,forms
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 5.2
+Classifier: Framework :: Django :: 6.0
+Classifier: Framework :: Django :: 6.1
+Classifier: Framework :: Wagtail
+Classifier: Framework :: Wagtail :: 7
+Classifier: Framework :: Wagtail :: 8
+Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: wagtail<9.0,>=7.0
+Requires-Dist: Unidecode<2.0,>=0.04.14
+Requires-Dist: wagtail-generic-chooser>=0.8
+Requires-Dist: wagtail-modeladmin>=2.5.0
+Dynamic: license-file
+
 Wagtail StreamForms
 ===================
 
@@ -9,6 +47,33 @@ of file fields. Form submissions are controlled by hooks that you can add that p
 Templates can be created which will then appear as choices when you build your form,
 allowing you to display and submit a form however you want.
 
+Installation
+------------
+
+.. code:: bash
+
+    $ pip install wagtailstreamforms
+
+or, in a project managed with `uv <https://docs.astral.sh/uv/>`_:
+
+.. code:: bash
+
+    $ uv add wagtailstreamforms
+
+Then follow the `installation guide <https://wagtailstreamforms.readthedocs.io/en/latest/installation.html>`_.
+
+Compatibility
+-------------
+
+==================  ==============  ==========================  ===============
+wagtailstreamforms  Wagtail         Django                      Python
+==================  ==============  ==========================  ===============
+5.3                 7.0 - 8.x       5.2, 6.0, 6.1 [#django]_    3.10 - 3.14
+5.1 - 5.2           6.0 - 7.x       as supported by Wagtail     3.9+
+==================  ==============  ==========================  ===============
+
+.. [#django] Whichever of these the installed Wagtail version supports. Django 6.x requires Python 3.12+.
+
 Backwards Compatibility
 -----------------------
 
@@ -65,6 +130,21 @@ Screenshots
 
    Form Fields Selection
 
+Development
+-----------
+
+The project is managed with `uv <https://docs.astral.sh/uv/>`_.
+
+.. code:: bash
+
+    $ git clone https://github.com/labd/wagtailstreamforms.git
+    $ cd wagtailstreamforms
+    $ make install   # uv sync --all-groups
+    $ make test      # run the test suite against the locked versions
+    $ make tox       # run the full Python/Django/Wagtail matrix via tox-uv
+    $ make format    # ruff
+    $ make docs      # build the Sphinx documentation
+
 Example site with docker
 ------------------------
 

wagtailstreamforms-5.3.0/wagtailstreamforms.egg-info/requires.txt

@@ -0,0 +1,4 @@
+wagtail<9.0,>=7.0
+Unidecode<2.0,>=0.04.14
+wagtail-generic-chooser>=0.8
+wagtail-modeladmin>=2.5.0

wagtailstreamforms-5.2.5/pyproject.toml

@@ -1,59 +0,0 @@
-[tool.djlint]
-format_css = false
-ignore = "H031"
-
-[tool.ruff]
-line-length = 99
-extend-exclude = ["**/migrations/"]
-lint.extend-select = ["I"]
-lint.extend-ignore = ["F405", "E731"]
-
-[tool.pytest.ini_options]
-DJANGO_SETTINGS_MODULE = "tests.settings"
-testpaths = ["tests/"]
-django_find_project = false
-addopts = ["--nomigrations"]
-filterwarnings = [
-    "ignore::DeprecationWarning",
-    "ignore::PendingDeprecationWarning",
-]
-
-[tool.uv]
-dev-dependencies = ["mock", "pytest-django", "pytest", "pre-commit", "ruff"]
-
-[tool.setuptools.packages.find]
-include = ["wagtailstreamforms*"]
-exclude = ["tests*", "docs*"]
-
-
-[project]
-name = "wagtailstreamforms"
-version = "5.2.5"
-description = ""
-authors = [{ name = "Lab Digital BV", email = "info@labdigital.nl" }]
-dependencies = [
-    "wagtail>=6.0,<8.0",
-    "Unidecode>=0.04.14,<2.0",
-    "wagtail-generic-chooser>=0.7.0",
-    "wagtail-modeladmin>=2.2.0",
-    "django-recaptcha>=4.0.0",
-    "psycopg>=3.2.9",
-    "tox>=4.26.0",
-]
-requires-python = ">=3.9"
-readme = "README.rst"
-license = { text = "Proprietary" }
-classifiers = [
-    "License :: Other/Proprietary License",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-]
-
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"

wagtailstreamforms-5.2.5/wagtailstreamforms/__init__.py

@@ -1 +0,0 @@
-__version__ = "4.1.0"

wagtailstreamforms-5.2.5/wagtailstreamforms.egg-info/requires.txt

@@ -1,7 +0,0 @@
-wagtail<8.0,>=6.0
-Unidecode<2.0,>=0.04.14
-wagtail-generic-chooser>=0.7.0
-wagtail-modeladmin>=2.2.0
-django-recaptcha>=4.0.0
-psycopg>=3.2.9
-tox>=4.26.0