Use ruff instead of Black

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 4.3.4 / Unreleased
 
 - Test with Python 3.13
+- Use ruff instead of black/isort
 
 ## 4.3.3 / 2024-05-04
 

Pipfile

@@ -4,10 +4,10 @@ verify_ssl = true
 name = "pypi"
 
 [dev-packages]
-black = "~=24.3"
+# black = "~=24.3"
 Cheroot = "*"  # "~=8.5"
 cx_Freeze = {version = "*", markers="sys_platform == 'win32'"}
-isort = "*"
+# isort = "*"
 mypy = "*"
 Paste = "*"  # "~=2.0"
 pylint = "*"

pyproject.toml

@@ -1,27 +1,27 @@
-[tool.black]
-line-length = 88
-target-version = ['py38', 'py39', 'py310', 'py311']
-include = '\.pyi?$'
-exclude = '''
-/(
-    \.git
-  | \.hg
-  | \.tox
-  | \.venv
-  | \.eggs
-  | \.cache
-  | build
-  | __pycache__
-  | dist
-  | \.*
+# [tool.black]
+# line-length = 88
+# target-version = ['py38', 'py39', 'py310', 'py311']
+# include = '\.pyi?$'
+# exclude = '''
+# /(
+#     \.git
+#   | \.hg
+#   | \.tox
+#   | \.venv
+#   | \.eggs
+#   | \.cache
+#   | build
+#   | __pycache__
+#   | dist
+#   | \.*
 
-)/
-'''
+# )/
+# '''
 
-[tool.isort]
-# See https://black.readthedocs.io/en/stable/compatible_configs.html
-profile = "black"
-src_paths = ["wsgidav", "tests"]
+# [tool.isort]
+# # See https://black.readthedocs.io/en/stable/compatible_configs.html
+# profile = "black"
+# src_paths = ["wsgidav", "tests"]
 
 
 [tool.ruff]

requirements-dev.txt

@@ -4,7 +4,6 @@
 
 cheroot~=10.0
 Paste~=3.0
-black~=24.3
 pytest~=8.2
 pytest-cov~=5.0
 # recommonmark

tox.ini

@@ -97,31 +97,30 @@ deps =
 commands =
     ruff -V
     ruff check wsgidav tests setup.py
+    ruff format --check wsgidav tests setup.py
 
-[testenv:check]
-description = Check Black formatting compliance and add flake8-bugbear checks
-skip_install = true
-deps =
-    black ~=24.3
-    isort
-    {[testenv:lint]deps}
-changedir = {toxinidir}
-commands =
-    {[testenv:lint]commands}
-    isort --check-only --profile black wsgidav tests setup.py
-    black --check --diff wsgidav tests setup.py
+; [testenv:check]
+; description = Check Black formatting compliance and add flake8-bugbear checks
+; skip_install = true
+; deps =
+;     black ~=24.3
+;     isort
+;     {[testenv:lint]deps}
+; changedir = {toxinidir}
+; commands =
+;     {[testenv:lint]commands}
+;     isort --check-only --profile black wsgidav tests setup.py
+;     black --check --diff wsgidav tests setup.py
 
 
 [testenv:format]
-description = Reformat python code using Black and isort
+description = Reformat python code using ruff (Black, isort, and pyupgrade)
 deps =
-    {[testenv:check]deps}
+    {[testenv:lint]deps}
 changedir = {toxinidir}
 commands =
     ruff check --fix wsgidav tests setup.py
-    ; ruff format wsgidav tests setup.py
-    isort --profile black wsgidav tests setup.py {posargs}
-    black wsgidav tests setup.py
+    ruff format wsgidav tests setup.py
     {[testenv:lint]commands}