Security/748 updated dependency to black (#749)

Author: ckunki

doc/changes/unreleased.md

@@ -1,3 +1,7 @@
 # Unreleased
 
 ## Summary
+
+## Security Issues
+
+* #748: Updated dependency to `black`

exasol/toolbox/metrics.py

@@ -307,13 +307,11 @@ def _key(name: str) -> str:
         for name, entry in entries.items()
     )
 
-    return cleandoc(
-        """
+    return cleandoc("""
     {heading}
     {seperator}
     {entries}
-    """
-    ).format(
+    """).format(
         heading=row.format("Category", "Status"),
         seperator=row.format("-" * col1_width, "-" * col2_width),
         entries="\n".join(rows),

exasol/toolbox/tools/lint.py

@@ -58,11 +58,9 @@ def _rows(findings: Iterable[Finding]) -> str:
             rows += f"|{finding.message}|\n"
         return rows
 
-    template = cleandoc(
-        """
+    template = cleandoc("""
         {header}{rows}
-        """
-    )
+        """)
     lint_issues = sorted(lint_issues, key=lambda i: (i.path, i.message_id, i.line))
     return template.format(header=_header(), rows=_rows(lint_issues))
 

exasol/toolbox/tools/security.py

@@ -200,11 +200,9 @@ def from_json(report_str: str, prefix: Path) -> Iterable[SecurityIssue]:
 
 
 def issues_to_markdown(issues: Iterable[SecurityIssue]) -> str:
-    template = cleandoc(
-        """
+    template = cleandoc("""
         {header}{rows}
-    """
-    )
+    """)
 
     def _header():
         header = "# Security\n\n"
@@ -233,8 +231,7 @@ def security_issue_body(issue: Issue) -> str:
     def as_markdown_listing(elements: Iterable[str]):
         return "\n".join(f"- {element}" for element in elements)
 
-    body = cleandoc(
-        """
+    body = cleandoc("""
         ## Summary
         {description}
 
@@ -243,8 +240,7 @@ def as_markdown_listing(elements: Iterable[str]):
 
         ## References
         {references}
-        """
-    )
+        """)
     return body.format(
         cve=issue.cve,
         cwe=issue.cwe,

exasol/toolbox/util/dependencies/licenses.py

@@ -131,12 +131,10 @@ class PackageLicenseReport:
 
     @staticmethod
     def _format_group_table_header(group: str) -> str:
-        return cleandoc(
-            f"""## `{group}` Dependencies
+        return cleandoc(f"""## `{group}` Dependencies
             |Package|Version|License|
             |---|---|---|
-            """
-        )
+            """)
 
     def _format_group_table(
         self, group: str, group_package_names: set[NormalizedPackageStr]

exasol/toolbox/util/release/changelog.py

@@ -13,16 +13,11 @@
 from exasol.toolbox.util.dependencies.track_changes import DependencyChanges
 from exasol.toolbox.util.version import Version
 
-UNRELEASED_INITIAL_CONTENT = (
-    cleandoc(
-        """
+UNRELEASED_INITIAL_CONTENT = cleandoc("""
     # Unreleased
 
     ## Summary
-    """
-    )
-    + "\n"
-)
+    """) + "\n"
 
 
 class Changelogs:

poetry.lock

@@ -28,7 +28,7 @@ classifiers = [
 ]
 dependencies = [
     "bandit[toml]>=1.7.9,<2",
-    "black>=24.1.0,<26",
+    "black>=26.3.1,<27",
     "coverage>=6.4.4,<8.0.0",
     "furo>=2022.9.15",
     "importlib-resources>=5.12.0",
@@ -38,7 +38,7 @@ dependencies = [
     "mypy>=0.971",
     "myst-parser>=2.0.0,<4",
     "nox>=2022.8.7",
-    "pip-audit>=2.7.3,<3",
+    "pip-audit>=2.7.3,<2.10.0", # see issue https://github.com/exasol/python-toolbox/issues/750
     "pip-licenses>=5.0.0,<6",
     "pluggy>=1.5.0,<2",
     "pre-commit>=4,<5",

pyproject.toml

@@ -23,12 +23,10 @@ def create_poetry_project(tmp_path, sample_vulnerability, poetry_path):
         env={},
     )
 
-    poetry_export = cleandoc(
-        """
+    poetry_export = cleandoc("""
     [tool.poetry.requires-plugins]
     poetry-plugin-export = ">=1.8"
-    """
-    )
+    """)
 
     with (poetry_root_dir / "pyproject.toml").open("a") as f:
         f.write(poetry_export)

test/integration/util/dependencies/audit_integration_test.py

@@ -280,14 +280,12 @@ def test_missing_files(tmp_path, capsys):
             copy_artifacts(session)
         captured = capsys.readouterr()
         assert re.match(
-            cleandoc(
-                """
+            cleandoc("""
                 Could not find any file .*/coverage-python9.9\\*/.coverage
                 File not found .*/lint-python9.9/.lint.txt
                 File not found .*/lint-python9.9/.lint.json
                 File not found .*/security-python9.9/.security.json
-                """
-            ),
+                """),
             captured.err,
         )
 
@@ -313,13 +311,11 @@ def test_all_files(tmp_path, capsys):
             EndsWith("coverage-python9.9-slow/.coverage"),
         )
         assert re.match(
-            cleandoc(
-                """
+            cleandoc("""
                 Copying file .*/lint-python9.9/.lint.txt
                 Copying file .*/lint-python9.9/.lint.json
                 Copying file .*/security-python9.9/.security.json
-                """
-            ),
+                """),
             captured.err,
         )
         for f in [".lint.txt", ".lint.json", ".security.json"]:
@@ -347,9 +343,7 @@ def test_that_bad_coverage_file_still_raises_error(
         monkeypatch.setattr(_artifacts, "COVERAGE_XML", coverage_xml)
         _create_coverage_file(coverage_db, COVERAGE_TABLES)
 
-        with pytest.raises(
-            _SessionQuit, match="doesn't seem to be a coverage data file"
-        ):
+        with pytest.raises(_SessionQuit, match="isn't a coverage data file"):
             _prepare_coverage_xml(nox_session, tmp_path, cwd=tmp_path)
 
         assert coverage_db.exists()