Fix regression in metadata

* update pre-commit
* drop black formatter

Author: penguinolog

.github/workflows/pythonpackage.yml

@@ -26,6 +26,23 @@ jobs:
         run: |
           ruff check . --output-format github
 
+  Formatting:
+    name: Check formatting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+         python-version: '3.x'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade ruff
+      - name: Check formatting
+        run: |
+          ruff format --check .
+
   PyLint:
     runs-on: ubuntu-latest
     steps:
@@ -64,22 +81,6 @@ jobs:
         run: |
           mypy --strict logwrap
 
-  Black:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.x'
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade black regex
-      - name: Check code style with black
-        run: |
-          black --check logwrap
-
   Refurb:
     runs-on: ubuntu-latest
     steps:
@@ -96,7 +97,7 @@ jobs:
         run: |
           refurb --format github logwrap
   Test:
-    needs: [PEP8, PyLint, MyPy, Black, Refurb]  # isort is broken
+    needs: [PEP8, Formatting, PyLint, MyPy, Refurb]  # isort is broken
     runs-on: ${{ matrix.os }}
     strategy:
       max-parallel: 6

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
     - id: check-yaml
     - id: end-of-file-fixer
     - id: trailing-whitespace
     - id: mixed-line-ending
 
   - repo: https://github.com/pycqa/isort
-    rev: 6.0.1
+    rev: 7.0.0
     hooks:
     - id: isort
       name: isort (python)
@@ -19,21 +19,15 @@ repos:
       name: isort (pyi)
       types: [pyi]
 
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
-    hooks:
-    - id: black
-      # It is recommended to specify the latest version of Python
-      # supported by your project here, or alternatively use
-      # pre-commit's default_language_version, see
-      # https://pre-commit.com/#top_level-default_language_version
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.11.8
+    rev: v0.14.6
     hooks:
-    - id: ruff
-      args: [ --fix, --exit-non-zero-on-fix ]
+      # Run the linter.
+      - id: ruff-check
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
 
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0  # Use the ref you want to point at

README.rst

@@ -16,8 +16,6 @@ logwrap
     :target: https://pypi.python.org/pypi/logwrap
 .. image:: https://img.shields.io/github/license/python-useful-helpers/logwrap.svg
     :target: https://raw.githubusercontent.com/python-useful-helpers/logwrap/master/LICENSE
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/ambv/black
 
 
 logwrap is a helper for logging in human-readable format function arguments and call result on function call.

pyproject.toml

@@ -13,7 +13,7 @@ name = "logwrap"
 description = "Decorator for logging function arguments and return value by human-readable way"
 requires-python = ">=3.9.0"
 keywords = ["logging", "debugging", "development"]
-license="Apache-2.0}  # Use SPDX classifier
+license="Apache-2.0"  # Use SPDX classifier
 license-files=["LICENSE"]
 readme = {file = "README.rst", content-type = "text/x-rst"}
 authors=[{name="Aleksei Stepanov", email="[email protected]"}]
@@ -57,10 +57,6 @@ universal = 0
 [tool.setuptools_scm]
 write_to = "logwrap/_version.py"
 
-[tool.black]
-line-length = 120
-target-version = ["py39"]
-
 [tool.isort]
 line_length = 120
 multi_line_output = 3

test/test_log_wrap.py

@@ -335,7 +335,7 @@ def func(arg, darg=1, *args, **kwargs):
             f"    arg=0,\n"
             f"    darg=1,\n"
             f"    # VAR_POSITIONAL:\n"
-            f"    args={logwrap.pretty_repr((2, ), indent=4, no_indent_start=True)},\n"
+            f"    args={logwrap.pretty_repr((2,), indent=4, no_indent_start=True)},\n"
             f"    # VAR_KEYWORD:\n"
             f"    kwargs={logwrap.pretty_repr({'arg3': 3}, indent=4, no_indent_start=True)},\n"
             f")\n"

test/test_repr_utils.py

@@ -341,9 +341,7 @@ class WithUnionAnn:
 
         test_dc = WithUnionAnn(None)
         self.assertEqual(
-            "test_repr_utils.WithUnionAnn(\n"
-            "    a=None,  # type: int | None\n"
-            ")",
+            "test_repr_utils.WithUnionAnn(\n    a=None,  # type: int | None\n)",
             logwrap.pretty_repr(test_dc),
         )
 

tox.ini

@@ -5,7 +5,7 @@
 
 [tox]
 minversion = 3.15
-envlist = isort, black, ruff, pylint, mypy, refurb, pep257, py3{8,9,10,11,12}, readme, doc8, docs
+envlist = isort, ruff, pylint, mypy, refurb, pep257, py3{8,9,10,11,12}, readme, doc8, docs
 skip_missing_interpreters = True
 
 [testenv]
@@ -29,33 +29,39 @@ commands =
   py.test --self-contained-html --html=report.html
 
 [testenv:py3{8,9,10,11,12}]
-depends = pylint,mypy,pep8,ruff,refurb,pep257,bandit,black,isort
+depends = pylint,mypy,pep8,ruff,ruff-format,refurb,pep257,bandit,isort
 
 [testenv:venv]
 commands = {posargs:}
 
 [testenv:ruff]
 skip_install = true
-depends = black,isort
-deps = ruff>=0.1.7
+depends = isort
+deps = ruff>=0.14.6
 commands = ruff check .
 
+[testenv:ruff-format]
+skip_install = true
+depends = isort
+deps = ruff>=0.14.6
+commands = ruff format --check .
+
 [testenv:refurb]
 skip_install = true
-depends = black,isort
+depends = isort
 deps = refurb
 commands = refurb logwrap
 
 [testenv:pep8]
 skip_install = true
-depends = black,isort
+depends = isort
 deps =
   -r{toxinidir}/flake8_requirements.txt
 commands = flake8 logwrap
 
 [testenv:pep257]
 skip_install = true
-depends = black,isort
+depends = isort
 deps =
   pydocstyle[toml]
 commands = pydocstyle -v logwrap
@@ -94,7 +100,7 @@ commands =
   twine check {toxinidir}/dist/*
 
 [testenv:bandit]
-depends = black,isort
+depends = isort
 deps = bandit
 commands = bandit -r logwrap
 
@@ -104,15 +110,6 @@ deps =
   pipdeptree
 commands = pipdeptree
 
-[testenv:black]
-skip_install = true
-depends = isort
-deps =
-  black
-  regex
-commands =
-  black logwrap
-
 [testenv:mypy]
 depends = pep8,ruff,pep257,bandit
 deps =