Use dependency groups & a fully locked dev environment

Author: hynek

.pre-commit-config.yaml.orig

@@ -0,0 +1,37 @@
+---
+ci:
+  autoupdate_schedule: monthly
+
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+<<<<<<< HEAD
+    rev: v0.9.3
+||||||| parent of 4b73e13 (Use dependency groups & a fully locked dev environment)
+    rev: v0.8.6
+=======
+    rev: v0.9.2
+>>>>>>> 4b73e13 (Use dependency groups & a fully locked dev environment)
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
+
+  - repo: https://github.com/econchick/interrogate
+    rev: 1.7.0
+    hooks:
+      - id: interrogate
+        args: [tests]
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.4.0
+    hooks:
+      - id: codespell
+        args: [--exclude-file=tests/test_mypy.yml]
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-toml
+      - id: check-yaml

pyproject.toml

@@ -10,12 +10,11 @@ name = "attrs"
 authors = [{ name = "Hynek Schlawack", email = "[email protected]" }]
 license = "MIT"
 license-files = ["LICENSE"]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 description = "Classes Without Boilerplate"
 keywords = ["class", "attribute", "boilerplate"]
 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",
@@ -28,29 +27,41 @@ classifiers = [
 dependencies = []
 dynamic = ["version", "readme"]
 
-[project.optional-dependencies]
+[project.urls]
+Documentation = "https://www.attrs.org/"
+Changelog = "https://www.attrs.org/en/stable/changelog.html"
+GitHub = "https://github.com/python-attrs/attrs"
+Funding = "https://github.com/sponsors/hynek"
+Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi"
+
+
+[dependency-groups]
 tests-mypy = [
   'pytest-mypy-plugins; platform_python_implementation == "CPython" and python_version >= "3.10"',
   # Since the mypy error messages keep changing, we have to keep updating this
   # pin.
   'mypy>=1.11.1; platform_python_implementation == "CPython" and python_version >= "3.10"',
 ]
 tests = [
+  { include-group = "tests-mypy" },
   # For regression test to ensure cloudpickle compat doesn't break.
   'cloudpickle; platform_python_implementation == "CPython"',
   "hypothesis",
   "pympler",
   # 4.3.0 dropped last use of `convert`
   "pytest>=4.3.0",
-  "pytest-xdist[psutil]",
-  "attrs[tests-mypy]",
 ]
 cov = [
-  "attrs[tests]",
+  { include-group = "tests" },
   # Ensure coverage is new enough for `source_pkgs`.
   "coverage[toml]>=5.3",
 ]
-benchmark = ["pytest-codspeed", "pytest-xdist[psutil]", "attrs[tests]"]
+pyright = ["pyright", { include-group = "tests" }]
+benchmark = [
+  { include-group = "tests" },
+  "pytest-codspeed",
+  "pytest-xdist[psutil]",
+]
 docs = [
   "cogapp",
   "furo",
@@ -59,17 +70,10 @@ docs = [
   "sphinx-notfound-page",
   "sphinxcontrib-towncrier",
   # See https://github.com/sphinx-contrib/sphinxcontrib-towncrier/issues/92
-  # Pin also present in tox.ini
   "towncrier<24.7",
 ]
-dev = ["attrs[tests]", "pre-commit-uv"]
-
-[project.urls]
-Documentation = "https://www.attrs.org/"
-Changelog = "https://www.attrs.org/en/stable/changelog.html"
-GitHub = "https://github.com/python-attrs/attrs"
-Funding = "https://github.com/sponsors/hynek"
-Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi"
+docs-watch = [{ include-group = "docs" }, "watchfiles"]
+dev = [{ include-group = "tests" }]
 
 
 [tool.hatch.version]
@@ -227,6 +231,8 @@ ignore = [
   "TD",      # we don't follow other people's todo style
   "TRY301",  # I'm sorry, but this makes not sense for us.
   "UP031",   # format() is slow as molasses; % and f'' FTW.
+  "UP006",   # replace Dict etc by dict etc later.
+  "UP035",   # replace Dict etc by dict etc later.
 ]
 
 [tool.ruff.lint.per-file-ignores]
@@ -254,10 +260,10 @@ ignore = [
 "src/*/*.pyi" = ["ALL"] # TODO
 "tests/test_annotations.py" = ["FA100"]
 "tests/typing_example.py" = [
-  "E741",   # ambiguous variable names don't matter in type checks
-  "B018",   # useless expressions aren't useless in type checks
-  "B015",   # pointless comparison in type checks aren't pointless
-  "UP037",  # we test some older syntaxes on purpose
+  "E741",  # ambiguous variable names don't matter in type checks
+  "B018",  # useless expressions aren't useless in type checks
+  "B015",  # pointless comparison in type checks aren't pointless
+  "UP037", # we test some older syntaxes on purpose
 ]
 
 [tool.ruff.lint.isort]

src/attr/_compat.py

@@ -10,7 +10,6 @@
 
 
 PYPY = platform.python_implementation() == "PyPy"
-PY_3_9_PLUS = sys.version_info[:2] >= (3, 9)
 PY_3_10_PLUS = sys.version_info[:2] >= (3, 10)
 PY_3_11_PLUS = sys.version_info[:2] >= (3, 11)
 PY_3_12_PLUS = sys.version_info[:2] >= (3, 12)

src/attr/_funcs.py

@@ -3,7 +3,7 @@
 
 import copy
 
-from ._compat import PY_3_9_PLUS, get_generic_base
+from ._compat import get_generic_base
 from ._make import _OBJ_SETATTR, NOTHING, fields
 from .exceptions import AttrsAttributeNotFoundError
 
@@ -450,10 +450,11 @@ class yet.
     if getattr(cls, "__attrs_types_resolved__", None) != cls:
         import typing
 
-        kwargs = {"globalns": globalns, "localns": localns}
-
-        if PY_3_9_PLUS:
-            kwargs["include_extras"] = include_extras
+        kwargs = {
+            "globalns": globalns,
+            "localns": localns,
+            "include_extras": include_extras,
+        }
 
         hints = typing.get_type_hints(cls, **kwargs)
         for field in fields(cls) if attribs is None else attribs: