Replace flake8, black and isort with ruff

Author: mxamin

.pre-commit-config.yaml

@@ -1,48 +1,42 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/psf/black
-    rev: 25.1.0
-    hooks:
-    -   id: black
-        types: []
-        files: ^.*.pyi?$
-        exclude: ^doc/
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
-    hooks:
-    -   id: no-commit-to-branch
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
-    -   id: check-ast
-    -   id: check-merge-conflict
-    -   id: check-json
-    -   id: detect-private-key
-        exclude: ^.*/rsakey.pem$
-    -   id: mixed-line-ending
-    -   id: pretty-format-json
-        args: [--autofix]
--   repo: https://github.com/PyCQA/flake8
-    rev: 7.3.0
-    hooks:
-    -   id: flake8
-        exclude: ^setup.py$
-        additional_dependencies: [flake8-docstrings, flake8-bugbear, flake8-logging-format, flake8-builtins, flake8-eradicate, flake8-fixme, pep8-naming, flake8-pep3101, flake8-annotations-complexity,flake8-pyi]
--   repo: https://github.com/PyCQA/isort
-    rev: 6.0.1
-    hooks:
-    -   id: isort
--   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.16.1
-    hooks:
-    -   id: mypy
-        exclude: (setup.py|tests/.*.py|doc/.*)
-        types: []
-        files: ^.*.pyi?$
-        additional_dependencies: [lxml-stubs,types-docutils]
--   repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.10.0
-    hooks:
-    -   id: rst-backticks
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.12.3
+  hooks:
+    - id: ruff
+      args: ["--fix"]
+      types: [python]
+    - id: ruff-format
+      types: [python]
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+    - id: no-commit-to-branch
+    - id: trailing-whitespace
+    - id: end-of-file-fixer
+    - id: check-yaml
+    - id: check-added-large-files
+    - id: check-ast
+    - id: check-merge-conflict
+    - id: check-json
+    - id: detect-private-key
+      exclude: ^.*/rsakey.pem$
+    - id: mixed-line-ending
+    - id: pretty-format-json
+      args: [--autofix]
+
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.16.1
+  hooks:
+    - id: mypy
+      exclude: (setup.py|tests/.*.py|doc/.*)
+      types: []
+      files: ^.*.pyi?$
+      additional_dependencies: [lxml-stubs, types-docutils]
+
+- repo: https://github.com/pre-commit/pygrep-hooks
+  rev: v1.10.0
+  hooks:
+    - id: rst-backticks

pyproject.toml

@@ -1,3 +1,6 @@
+[build-system]
+requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4", "pkgconfig>=1.5.1", "lxml>=3.8, !=4.7.0"]
+
 [tool.mypy]
 files = ['src']
 ignore_missing_imports = false
@@ -19,32 +22,69 @@ warn_no_return = true
 no_implicit_reexport = true
 show_error_codes = true
 
-[tool.black]
-line_length = 130
-skip-string-normalization = true
-target_version = ['py39']
-include = '\.pyi?$'
-exclude = '''
+[tool.ruff]
+# Maximum line length, same as your original Black + Flake8 config
+line-length = 130
 
-(
-  /(
-      \.eggs         # exclude a few common directories in the
-    | \.git          # root of the project
-    | \.mypy_cache
-    | \.tox
-    | build
-    | dist
-  )/
-)
-'''
+# Target Python version (used for autofixes and style rules)
+target-version = "py39"
 
-[tool.isort]
-profile = 'black'
-known_first_party = ['xmlsec']
-known_third_party = ['lxml', 'pytest', '_pytest', 'hypothesis']
+# Enable rule categories:
+# E = pycodestyle (style issues, like indentation, whitespace, etc.)
+# F = pyflakes (unused imports, undefined names)
+# D = pydocstyle (docstring format/style issues)
+# I = isort (import sorting)
+# B = flake8-bugbear (common bugs & anti-patterns)
+# UP = pyupgrade (auto-upgrade syntax for newer Python)
+# SIM = flake8-simplify (simplifiable code patterns)
+# RUF = Ruff-native rules (extra, performance-optimized checks)
+select = ["E", "F", "D", "I", "B", "UP", "SIM", "RUF"]
 
-[build-system]
-requires = ['setuptools>=42', 'wheel', 'setuptools_scm[toml]>=3.4', "pkgconfig>=1.5.1", "lxml>=3.8, !=4.7.0"]
+# Directories and files to exclude from linting and formatting
+exclude = [
+  ".venv*",         # virtual environments
+  ".git",           # git directory
+  "build",          # build output
+  "dist",           # distribution packages
+  "libs",           # vendor libraries
+  ".eggs",          # setuptools egg folders
+  ".direnv*",       # direnv environments
+  "*_pb2.pyi"       # protobuf-generated type stubs
+]
+
+# File-specific rule ignores (equivalent to flake8's `per-file-ignores`)
+[tool.ruff.per-file-ignores]
+"*.pyi" = [
+  # Ignore formatting and import errors in stub files
+  "E301", # expected 1 blank line, found 0
+  "E302", # expected 2 blank lines, found 1
+  "E305", # expected 2 blank lines after class or function
+  "E501", # line too long
+  "E701", # multiple statements on one line
+  "F401", # unused import
+  "F822"  # undefined name in `__all__`
+]
+"doc/source/conf.py" = [
+  "D1"    # missing docstring in public module/class/function
+]
+"doc/source/examples/*.py" = [
+  "D1",   # allow missing docstrings in examples
+  "E501"  # allow long lines in code examples
+]
+"tests/*.py" = [
+  "D1"    # allow missing docstrings in test files
+]
+
+[tool.ruff.format]
+# Always use single quotes (e.g., 'text' instead of "text")
+quote-style = "single"
+
+# Format code with or without trailing commas
+# true = prefer trailing commas where valid
+skip-magic-trailing-comma = false
+
+# Enforce Unix-style line endings (LF)
+line-ending = "lf"
 
 [tool.cibuildwheel]
 build = [

requirements-test.txt

@@ -1,3 +1,5 @@
 -r requirements.txt
-pytest>=4.6.9
-lxml-stubs
+
+pytest==8.4.1
+lxml-stubs==0.5.1
+ruff[format]==0.12.3

requirements.txt

@@ -1 +1 @@
-lxml >= 3.8.0, !=4.7.0
+lxml==6.0.0

setup.cfg

@@ -12,14 +12,11 @@ source-dir = doc/source
 build-dir  = doc/build
 all_files  = 1
 
-[upload_docs]
-upload_dir = doc/build/html
-
-[flake8]
-per-file-ignores =
-  *.pyi: E301, E302, E305, E501, E701, F401, F822
-  doc/source/conf.py: D1
-  doc/source/examples/*.py: D1, E501
-  tests/*.py: D1
-exclude = .venv*,.git,*_pb2.pyi,build,dist,libs,.eggs,.direnv*
-max-line-length = 130
+# [flake8]
+# per-file-ignores =
+#   *.pyi: E301, E302, E305, E501, E701, F401, F822
+#   doc/source/conf.py: D1
+#   doc/source/examples/*.py: D1, E501
+#   tests/*.py: D1
+# exclude = .venv*,.git,*_pb2.pyi,build,dist,libs,.eggs,.direnv*
+# max-line-length = 130

setup.py

@@ -596,7 +596,7 @@ def prepare_static_build(self, build_platform):
     long_description_content_type='text/markdown',
     ext_modules=[pyxmlsec],
     cmdclass={'build_ext': build_ext},
-    python_requires='>=3.5',
+    python_requires='>=3.9',
     setup_requires=setup_reqs,
     install_requires=['lxml>=3.8'],
     author="Bulat Gaifullin",
@@ -619,12 +619,11 @@ def prepare_static_build(self, build_platform):
         'Operating System :: OS Independent',
         'Programming Language :: C',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Topic :: Text Processing :: Markup :: XML',
         'Typing :: Typed',
     ],