[deps/fix] Upgraded docstrfmt and coverage

Also fixed non-unique docstrfmt adornments.
Removed unsupported Python 3.9.
Updated docstrfmt calls in releaser tool.

Author: nemesifier

.github/workflows/ci.yml

@@ -20,7 +20,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
@@ -31,13 +30,6 @@ jobs:
           - django~=5.1.0
           - django~=5.2.0
         exclude:
-          # Django 5.0+ requires Python >=3.10
-          - python-version: "3.9"
-            django-version: django~=5.0.0
-          - python-version: "3.9"
-            django-version: django~=5.1.0
-          - python-version: "3.9"
-            django-version: django~=5.2.0
           # Python 3.13 supported only in Django >=5.1.3
           - python-version: "3.13"
             django-version: django~=4.2.0

openwisp-qa-check

@@ -118,7 +118,7 @@ runflake8() {
 }
 
 runrstcheck() {
-  cmd="docstrfmt --no-docstring-trailing-line --ignore-cache --check --line-length 74 ."
+  cmd="docstrfmt --no-docstring-trailing-line -i -c -l 74 -s =-~+^\"\'.: ."
   $($cmd --quiet) &&
     echo "SUCCESS: ReStructuredText check successful!" ||
     {

openwisp-qa-format

@@ -3,7 +3,9 @@ set -e
 
 isort .
 black .
-docstrfmt --no-docstring-trailing-line --ignore-cache --line-length 74 .
+docstrfmt --no-docstring-trailing-line --ignore-cache \
+  --section-adornments "=-~+^\"\'.:" \
+  --line-length 74 .
 
 if which prettier > /dev/null; then
   prettier --write "**/*.+(yml|yaml|md|js|json|css)" --print-width 88

openwisp_utils/releaser/changelog.py

@@ -7,6 +7,8 @@
 
 import questionary
 
+from .utils import _call_docstrfmt
+
 
 def find_cliff_config():
     # Locates the cliff.toml file packaged within 'openwisp_utils'.
@@ -155,19 +157,7 @@ def format_rst_block(content):
             temp_file_path = tf.name
             tf.write(content_with_header)
 
-        subprocess.run(
-            [
-                "docstrfmt",
-                "--no-docstring-trailing-line",
-                "--ignore-cache",
-                "--line-length",
-                "74",
-                temp_file_path,
-            ],
-            check=True,
-            capture_output=True,
-            text=True,
-        )
+        _call_docstrfmt(temp_file_path)
 
         with open(temp_file_path, "r") as tf:
             formatted_full_content = tf.read()

openwisp_utils/releaser/tests/test_utils.py

@@ -113,6 +113,8 @@ def test_format_file_with_docstrfmt_success(mock_print, mock_subprocess):
     expected_command = [
         "docstrfmt",
         "--ignore-cache",
+        "--section-adornments",
+        "=-~+^\"'.:",
         "--line-length",
         "74",
         file_path,

openwisp_utils/releaser/utils.py

@@ -93,17 +93,29 @@ def rst_to_markdown(text):
     ).strip()
 
 
+def _call_docstrfmt(file_path):
+    return subprocess.run(
+        [
+            "docstrfmt",
+            "--ignore-cache",
+            "--section-adornments",
+            "=-~+^\"'.:",
+            "--line-length",
+            "74",
+            file_path,
+        ],
+        check=True,
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+    )
+
+
 def format_file_with_docstrfmt(file_path):
     """Format a file using `docstrfmt`."""
     while True:
         try:
-            subprocess.run(
-                ["docstrfmt", "--ignore-cache", "--line-length", "74", file_path],
-                check=True,
-                capture_output=True,
-                text=True,
-                encoding="utf-8",
-            )
+            _call_docstrfmt(file_path)
             print(f"✅ Formatted {file_path} successfully.")
             break
         except subprocess.CalledProcessError as e:

setup.py

@@ -37,9 +37,9 @@
             "black>=25.1,<25.10",
             "flake8~=7.3.0",
             "isort>=6.0.1,<7.1.0",
-            "coverage~=7.10.6",
+            "coverage>=7.10.0,<7.13.0",
             "tblib~=3.1.0",
-            "docstrfmt~=1.11.1",
+            "docstrfmt>=2.0.0,<2.1.0",
         ],
         "rest": [
             "djangorestframework~=3.16.0",