Fix tests (#231)

Author: vsakkasld

.github/workflows/python-release.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Build package
         run: uv build --sdist --wheel
       - name: Publish package
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

.github/workflows/python-test.yml

@@ -47,31 +47,3 @@ jobs:
         run: uv pip install --system tox tox-gh-actions
       - name: Test with tox
         run: uv run tox -e ${{ matrix.tox_env }} -- --index-url=https://pypi.python.org/simple/
-      - name: Prepare artifacts
-        run: mkdir -p .coverage-data && mv .coverage.* .coverage-data/
-      - uses: actions/upload-artifact@master
-        with:
-          name: coverage-data
-          path: .coverage-data/
-
-  coverage:
-    runs-on: ubuntu-latest
-    needs: [test]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@master
-        with:
-          name: coverage-data
-          path: .
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-      - name: Install dependencies
-        run: uv pip install --system tox
-      - name: Prepare Coverage report
-        run: uv run tox -e coverage-report
-      - name: Upload to codecov
-        uses: codecov/codecov-action@v5

.gitignore

@@ -6,6 +6,7 @@
 .python-version
 .tox
 .coverage.*
+.venv
 **__pycache__**
 *.pyc
 /dist/

Makefile

@@ -14,8 +14,8 @@ docs:
 	$(MAKE) -C docs html
 
 format:
-	isort --recursive wagtailstreamforms tests
-	black wagtailstreamforms/ tests/
+	ruff check --fix --select I wagtailstreamforms/ tests/
+	ruff format wagtailstreamforms/ tests/
 
 #
 # Utility

docs/conf.py

@@ -22,10 +22,10 @@
 import sys
 import wagtailstreamforms
 
-sys.path.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath("."))
+sys.path.insert(0, os.path.abspath(".."))
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
+os.environ["DJANGO_SETTINGS_MODULE"] = "tests.settings"
 django.setup()
 
 
@@ -38,26 +38,24 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = [
-    "sphinx.ext.autodoc"
-]
+extensions = ["sphinx.ext.autodoc"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = 'Wagtail Streamforms'
-copyright = '2018, Accent Design Group LTD'
-author = 'Stuart George'
+project = "Wagtail Streamforms"
+copyright = "2018, Accent Design Group LTD"
+author = "Stuart George"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -78,10 +76,10 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'default'
+pygments_style = "default"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -92,7 +90,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'karma_sphinx_theme'
+html_theme = "karma_sphinx_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -103,13 +101,13 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'WagtailStreamformsdoc'
+htmlhelp_basename = "WagtailStreamformsdoc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -118,15 +116,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -136,19 +131,21 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'WagtailStreamforms.tex', 'Wagtail Streamforms Documentation',
-     'STuart George', 'manual'),
+    (
+        master_doc,
+        "WagtailStreamforms.tex",
+        "Wagtail Streamforms Documentation",
+        "STuart George",
+        "manual",
+    ),
 ]
 
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'wagtailstreamforms', 'Wagtail Streamforms Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "wagtailstreamforms", "Wagtail Streamforms Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -157,10 +154,13 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'WagtailStreamforms', 'Wagtail Streamforms Documentation',
-     author, 'WagtailStreamforms', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "WagtailStreamforms",
+        "Wagtail Streamforms Documentation",
+        author,
+        "WagtailStreamforms",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
-
-
-

example/models.py

@@ -13,7 +13,6 @@ class AdvancedFormSetting(AbstractFormSetting):
 
 
 class BasicPage(Page):
-
     body = StreamField(
         [("rich_text", blocks.RichTextBlock()), ("form", WagtailFormBlock())],
         use_json_field=True,

example/settings.py

@@ -139,7 +139,7 @@
 # Wagtail
 
 WAGTAIL_SITE_NAME = "example.com"
-
+WAGTAILADMIN_BASE_URL = "/"
 
 # Forms
 
@@ -152,4 +152,4 @@
 RECAPTCHA_PUBLIC_KEY = "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
 RECAPTCHA_PRIVATE_KEY = "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe"
 NOCAPTCHA = True
-SILENCED_SYSTEM_CHECKS = ['django_recaptcha.recaptcha_test_key_error']
+SILENCED_SYSTEM_CHECKS = ["django_recaptcha.recaptcha_test_key_error"]

example/urls.py

@@ -9,14 +9,14 @@
 
 
 urlpatterns = [
-    re_path(r'^admin/', admin.site.urls),
-    re_path(r'^cms/', include(wagtailadmin_urls)),
-    re_path(r'^documents/', include(wagtaildocs_urls)),
+    re_path(r"^admin/", admin.site.urls),
+    re_path(r"^cms/", include(wagtailadmin_urls)),
+    re_path(r"^documents/", include(wagtaildocs_urls)),
 ]
 
 if settings.DEBUG:  # pragma: no cover
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 urlpatterns += [
-    re_path(r'', include(wagtail_urls)),
+    re_path(r"", include(wagtail_urls)),
 ]

example/wagtailstreamforms_hooks.py

@@ -5,35 +5,32 @@
 from wagtailstreamforms.hooks import register
 
 
-@register('process_form_submission')
+@register("process_form_submission")
 def email_submission(instance, form):
-    """ Send an email with the submission. """
+    """Send an email with the submission."""
 
-    if not hasattr(instance, 'advanced_settings'):
+    if not hasattr(instance, "advanced_settings"):
         return
 
     addresses = [instance.advanced_settings.to_address]
-    content = ['Please see below submission\n', ]
+    content = [
+        "Please see below submission\n",
+    ]
     from_address = settings.DEFAULT_FROM_EMAIL
-    subject = 'New Form Submission : %s' % instance.title
+    subject = "New Form Submission : %s" % instance.title
 
     # build up the email content
     for field, value in form.cleaned_data.items():
         if field in form.files:
             count = len(form.files.getlist(field))
-            value = '{} file{}'.format(count, pluralize(count))
+            value = "{} file{}".format(count, pluralize(count))
         elif isinstance(value, list):
-            value = ', '.join(value)
-        content.append('{}: {}'.format(field, value))
-    content = '\n'.join(content)
+            value = ", ".join(value)
+        content.append("{}: {}".format(field, value))
+    content = "\n".join(content)
 
     # create the email message
-    email = EmailMessage(
-        subject=subject,
-        body=content,
-        from_email=from_address,
-        to=addresses
-    )
+    email = EmailMessage(subject=subject, body=content, from_email=from_address, to=addresses)
 
     # attach any files submitted
     for field in form.files:

pyproject.toml

@@ -1,34 +1,25 @@
 [tool.djlint]
-format_css=false
-ignore="H031"
+format_css = false
+ignore = "H031"
 
 [tool.ruff]
 line-length = 99
 extend-exclude = ["**/migrations/"]
+lint.extend-select = ["I"]
 lint.extend-ignore = ["F405", "E731"]
 
-[tool.isort]
-profile = "black"
-line_length = 120
-multi_line_output = 3
-include_trailing_comma = true
-skip = ["migrations"]
-
 [tool.pytest.ini_options]
 DJANGO_SETTINGS_MODULE = "tests.settings"
 testpaths = ["tests/"]
 django_find_project = false
 addopts = ["--nomigrations"]
-filterwarnings = ["ignore::DeprecationWarning","ignore::PendingDeprecationWarning"]
+filterwarnings = [
+    "ignore::DeprecationWarning",
+    "ignore::PendingDeprecationWarning",
+]
 
 [tool.uv]
-dev-dependencies = [
-    "mock",
-    "pytest-django",
-    "pytest",
-    "pre-commit",
-    "ruff"
-]
+dev-dependencies = ["mock", "pytest-django", "pytest", "pre-commit", "ruff"]
 
 [tool.setuptools.packages.find]
 include = ["wagtailstreamforms*"]
@@ -39,9 +30,7 @@ exclude = ["tests*", "docs*"]
 name = "wagtailstreamforms"
 dynamic = ["version"]
 description = ""
-authors = [
-    {name = "Lab Digital BV", email = "info@labdigital.nl"},
-]
+authors = [{ name = "Lab Digital BV", email = "info@labdigital.nl" }]
 dependencies = [
     "wagtail>=4.1,<7.0",
     "Unidecode>=0.04.14,<2.0",
@@ -53,7 +42,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-license = {text = "Proprietary"}
+license = { text = "Proprietary" }
 classifiers = [
     "License :: Other/Proprietary License",
     "Programming Language :: Python",
@@ -66,6 +55,6 @@ classifiers = [
 ]
 
 [build-system]
-requires = ["setuptools",  "wheel", "setuptools_scm[toml]"]
+requires = ["setuptools", "wheel", "setuptools_scm[toml]"]
 build-backend = "setuptools.build_meta"
 packages = ["wagtailstreamforms"]