Update ruff (#959)

Makefile

@@ -12,11 +12,11 @@ tests:
 .PHONY: reformat
 reformat:
 	ruff format .
-	ruff --fix .
+	ruff check . --fix
 
 .PHONY: lint
 lint:
-	ruff .
+	ruff check .
 
 .PHONY: docs
 docs: clean

example/app/forms.py

@@ -41,7 +41,7 @@ class TestForm(forms.Form):
     message = forms.CharField(required=False, help_text="<i>my_help_text</i>")
     sender = forms.EmailField(label="Sender © unicode", help_text='E.g., "me@example.com"')
     secret = forms.CharField(initial=42, widget=forms.HiddenInput)
-    weird = forms.CharField(help_text="strings are now utf-8 \u03BCnico\u0394é!")
+    weird = forms.CharField(help_text="strings are now utf-8 \u03bcnico\u0394é!")
     cc_myself = forms.BooleanField(
         required=False, help_text='cc stands for "carbon copy." You will get a copy in your mailbox.'
     )

example/app/wsgi.py

@@ -12,6 +12,7 @@
 middleware here, or combine a Django application with an application of another
 framework.
 """
+
 import os
 
 from django.core.wsgi import get_wsgi_application

pyproject.toml

@@ -45,33 +45,33 @@ Source = "https://github.com/zostera/django-bootstrap3"
 
 [tool.ruff]
 fix = false
-fixable = [
+line-length = 120
+lint.fixable = [
   "I001", # isort (sorting)
   "F", # flake8
   "D", # docformatter
   "UP", # pyupgrade
 ]
-ignore = [
+lint.ignore = [
   "D1", # D1: Missing docstring error codes (because not every function and class has a docstring)
   "D203", # D203: 1 blank line required before class docstring (conflicts with D211 and should be disabled, see https://github.com/PyCQA/pydocstyle/pull/91)
   "D212", # D212: Multi-line docstring summary should start at the first line
   "D301", # D301: Use r”“” if any backslashes in a docstring (unclear how else to handle backslashes in docstrings)
 ]
-line-length = 120
-select = [
+lint.select = [
   "D", # pydocstyle
   "E", # pycodestyle
   "F", # flake8
   "I", # isort
   "UP", # pyupgrade
 ]
-src = ["src"]
-target-version = "py38"
-unfixable = [
+lint.unfixable = [
   "F8", # names in flake8, such as defined but unused variables
 ]
+src = ["src"]
+target-version = "py38"
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["bootstrap3", "app"]
 known-third-party = ["django"]
 

requirements-dev.txt

@@ -1,6 +1,6 @@
 -r requirements-test.txt
 -r docs/requirements.txt
-twine==4.0.2
+twine==5.0.0
 build==1.2.1
 setuptools==69.5.1
 setuptools_scm==8.0.4

src/bootstrap3/__about__.py

@@ -1,3 +1,3 @@
 import importlib.metadata
 
-__version__ = importlib.metadata.version('django-bootstrap3')
+__version__ = importlib.metadata.version("django-bootstrap3")

src/bootstrap3/forms.py

@@ -13,15 +13,26 @@
 from django.forms.widgets import CheckboxInput
 from django.utils.safestring import mark_safe
 
-from .bootstrap import get_bootstrap_setting, get_field_renderer, get_form_renderer, get_formset_renderer
+from .bootstrap import (
+    get_bootstrap_setting,
+    get_field_renderer,
+    get_form_renderer,
+    get_formset_renderer,
+)
 from .components import render_icon
 from .exceptions import BootstrapError
 from .text import text_concat, text_value
 from .utils import add_css_class, render_tag
 
 FORM_GROUP_CLASS = "form-group"
 
-WIDGETS_NO_REQUIRED = (AdminFileWidget, HiddenInput, FileInput, CheckboxInput, CheckboxSelectMultiple)
+WIDGETS_NO_REQUIRED = (
+    AdminFileWidget,
+    HiddenInput,
+    FileInput,
+    CheckboxInput,
+    CheckboxSelectMultiple,
+)
 
 
 def render_formset(formset, **kwargs):
@@ -96,9 +107,8 @@ def render_button(
     if button_type:
         if button_type not in ("submit", "reset", "button", "link"):
             raise BootstrapError(
-                'Parameter "button_type" should be "submit", "reset", "button", "link" or empty  ("{}" given).'.format(
-                    button_type
-                )
+                'Parameter "button_type" should be "submit", "reset", "button", "link" or empty '
+                + f'("{button_type}" given).'
             )
         attrs["type"] = button_type
     classes = add_css_class(classes, extra_classes)
@@ -117,7 +127,11 @@ def render_button(
         attrs["value"] = value
     if title:
         attrs["title"] = title
-    return render_tag(tag, attrs=attrs, content=mark_safe(text_concat(icon_content, content, separator=" ")))
+    return render_tag(
+        tag,
+        attrs=attrs,
+        content=mark_safe(text_concat(icon_content, content, separator=" ")),
+    )
 
 
 def render_field_and_label(field, label, field_class="", label_for=None, label_class="", layout="", **kwargs):

tests/app/forms.py

@@ -47,7 +47,7 @@ class TestForm(forms.Form):
     message = forms.CharField(required=False, help_text="<i>my_help_text</i>")
     sender = forms.EmailField(label="Sender © unicode", help_text='E.g., "me@example.com"')
     secret = forms.CharField(initial=42, widget=forms.HiddenInput)
-    weird = forms.CharField(help_text="strings are now utf-8 \u03BCnico\u0394é!")
+    weird = forms.CharField(help_text="strings are now utf-8 \u03bcnico\u0394é!")
     cc_myself = forms.BooleanField(
         required=False, help_text='cc stands for "carbon copy." You will get a copy in your mailbox.'
     )