Merge branch 'main' into support_oxford_comma

Author: staticdev

.flake8

@@ -1,2 +1,2 @@
-pip==24.0
-virtualenv==20.28.0
+pip==24.3.1
+virtualenv==20.29.0

.github/workflows/constraints.txt

@@ -18,12 +18,10 @@ jobs:
           - { python: "3.11", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.10", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.9", os: "ubuntu-latest", session: "mypy" }
-          - { python: "3.8", os: "ubuntu-latest", session: "mypy" }
           - { python: "3.12", os: "ubuntu-latest", session: "tests" }
           - { python: "3.11", os: "ubuntu-latest", session: "tests" }
           - { python: "3.10", os: "ubuntu-latest", session: "tests" }
           - { python: "3.9", os: "ubuntu-latest", session: "tests" }
-          - { python: "3.8", os: "ubuntu-latest", session: "tests" }
           - { python: "3.12", os: "windows-latest", session: "tests" }
           - { python: "3.12", os: "macos-latest", session: "tests" }
           - { python: "3.12", os: "ubuntu-latest", session: "typeguard" }
@@ -124,12 +122,11 @@ jobs:
           mv coverage-data-3.11-ubuntu-latest/* .
           mv coverage-data-3.10-ubuntu-latest/* .
           mv coverage-data-3.9-ubuntu-latest/* .
-          mv coverage-data-3.8-ubuntu-latest/* .
           hatch run coverage:run
 
       - name: Create coverage report
         run: |
           hatch run coverage:run-xml
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5

.github/workflows/tests.yml

@@ -1,27 +1,4 @@
 repos:
-  # Modifiers
-  - repo: https://github.com/psf/black
-    rev: 24.10.0
-    hooks:
-      - id: black
-
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v4.0.0-alpha.8
-    hooks:
-      - id: prettier
-
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
-    hooks:
-      - id: pyupgrade
-        args: [--py38-plus]
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        args: ["--filter-files"]
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
@@ -33,15 +10,11 @@ repos:
       - id: check-yaml
       - id: end-of-file-fixer
 
-  - repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
-    hooks:
-      - id: flake8
-
-  # Static Checkers
-  - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.10
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.9.1
     hooks:
-      - id: bandit
-        additional_dependencies: [".[toml]"]
-        args: ["-c", "bandit.yml"]
+      # Run the linter.
+      - id: ruff
+      # Run the formatter.
+      - id: ruff-format

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ sphinx:
   configuration: docs/conf.py
 formats: all
 python:
-  version: 3.8
+  version: 3.9
   install:
     - requirements: docs/requirements.txt
     - path: .

.readthedocs.yml

@@ -37,7 +37,7 @@ Request features on the [Issue Tracker].
 
 ## How to set up your development environment
 
-You need Python 3.8+ and the following tools:
+You need Python 3.9+ and the following tools:
 
 - [Hatch]
 

CONTRIBUTING.md

@@ -55,7 +55,7 @@
 
 ## Requirements
 
-- It works in Python 3.8+.
+- It works in Python 3.9+.
 
 ## Installation
 

README.md

@@ -9,13 +9,12 @@ license = {text = "MIT"}
 readme = "README.md"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
-    "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",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = []
 
 [tool.hatch.version]
@@ -58,21 +57,15 @@ run-xdoctest = [ "hatch run xdoctest:run" ]
 run-docs-build = [ "hatch run docs-build:run" ]
 
 [[tool.hatch.envs.sessions.matrix]]
-python = ["3.8", "3.9", "3.10", "3.11", "3.12"]
+python = ["3.9", "3.10", "3.11", "3.12"]
 
 [tool.hatch.envs.pre-commit]
 dependencies = [
-  "bandit",
-  "black",
-  "flake8",
-  "flake8-bugbear == 22.*",
-  "flake8-docstrings",
-  "isort",
-  "pep8-naming",
+  "ruff",
   "pre-commit",
   "pre-commit-hooks",
-  "pyupgrade",
 ]
+
 [tool.hatch.envs.pre-commit.scripts]
 run = [
   "pre-commit run --all-files --show-diff-on-failure",
@@ -93,6 +86,7 @@ dependencies = [
   "pytest",
   "freezegun",
 ]
+
 [tool.hatch.envs.mypy.scripts]
 run = [
   "mypy src/ tests/ docs/conf.py",
@@ -106,6 +100,7 @@ dependencies = [
   "pygments",
   "freezegun",
 ]
+
 [tool.hatch.envs.tests.scripts]
 run = [
   "coverage run --parallel -m pytest"
@@ -115,11 +110,13 @@ run = [
 dependencies = [
   "coverage[toml]",
 ]
+
 [tool.hatch.envs.coverage.scripts]
 run = [
   "- coverage combine",
   "coverage report",
 ]
+
 run-xml = [
   "coverage xml"
 ]
@@ -132,6 +129,7 @@ dependencies = [
   "typeguard",
   "pygments",
 ]
+
 [tool.hatch.envs.typeguard.scripts]
 run = [
   "pytest --typeguard-packages=human_readable",
@@ -141,6 +139,7 @@ run = [
 dependencies = [
   "xdoctest[colors]",
 ]
+
 [tool.hatch.envs.xdoctest.scripts]
 run = [
   "python -m xdoctest human_readable all",
@@ -152,6 +151,7 @@ dependencies = [
   "furo",
   "myst-parser",
 ]
+
 [tool.hatch.envs.docs-build.scripts]
 run = [
   "rm -rf docs/_build",
@@ -165,6 +165,7 @@ dependencies = [
   "furo",
   "myst-parser",
 ]
+
 [tool.hatch.envs.docs.scripts]
 run = [
   "rm -rf docs/_build",
@@ -183,10 +184,20 @@ source = ["human_readable", "tests"]
 show_missing = true
 fail_under = 100
 
-[tool.isort]
-profile = "black"
-force_single_line = true
-lines_after_imports = 2
+[tool.ruff]
+line-length = 80
+
+[tool.ruff.lint]
+select = ["B", "B9", "C", "D", "E", "F", "N", "W"]
+ignore = ["E203", "E501", "B905"]
+per-file-ignores = { "times.py" = ["N806"] }
+
+[tool.ruff.lint.mccabe]
+max-complexity = 10
+
+[tool.ruff.lint.isort]
+force-single-line = true
+lines-after-imports = 2
 
 [tool.mypy]
 strict = true
@@ -196,7 +207,6 @@ show_column_numbers = true
 show_error_codes = true
 show_error_context = true
 
-
 [[tool.mypy.overrides]]
 module = ["pytest_mock"]
 ignore_missing_imports = true

bandit.yml

@@ -29,11 +29,21 @@ def file_size(
 
     Returns:
         str: file size in natural language.
+
     """
     if gnu:
         suffixes = ("K", "M", "G", "T", "P", "E", "Z", "Y")
     elif binary:
-        suffixes = (" KiB", " MiB", " GiB", " TiB", " PiB", " EiB", " ZiB", " YiB")
+        suffixes = (
+            " KiB",
+            " MiB",
+            " GiB",
+            " TiB",
+            " PiB",
+            " EiB",
+            " ZiB",
+            " YiB",
+        )
     else:
         suffixes = (" KB", " MB", " GB", " TB", " PB", " EB", " ZB", " YB")