Merge branch 'main' into issue-1230

.github/workflows/ci.yml

@@ -33,6 +33,7 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
           # - "pypy-3.7"
           - "pypy-3.8"
           - "pypy-3.9"

pyproject.toml

@@ -21,6 +21,7 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: Implementation :: CPython",
   "Programming Language :: Python :: Implementation :: PyPy",
   "Typing :: Typed",

src/attr/_compat.py

@@ -14,6 +14,7 @@
 PY_3_9_PLUS = sys.version_info[:2] >= (3, 9)
 PY310 = sys.version_info[:2] >= (3, 10)
 PY_3_12_PLUS = sys.version_info[:2] >= (3, 12)
+PY_3_13_PLUS = sys.version_info[:2] >= (3, 13)
 
 
 if sys.version_info < (3, 8):

tests/test_cmp.py

@@ -4,10 +4,10 @@
 Tests for methods from `attrib._cmp`.
 """
 
-
 import pytest
 
 from attr._cmp import cmp_using
+from attr._compat import PY_3_13_PLUS
 
 
 # Test parameters.
@@ -54,6 +54,9 @@
 cmp_data = eq_data + order_data
 cmp_ids = eq_ids + order_ids
 
+# Compiler strips indents from docstrings in Python 3.13+
+indent = "" if PY_3_13_PLUS else " " * 8
+
 
 class TestEqOrder:
     """
@@ -325,7 +328,7 @@ def test_ne(self):
         method = self.cls.__ne__
         assert method.__doc__.strip() == (
             "Check equality and either forward a NotImplemented or\n"
-            "        return the result negated."
+            f"{indent}return the result negated."
         )
         assert method.__name__ == "__ne__"
 
@@ -393,7 +396,7 @@ def test_ne(self):
         method = self.cls.__ne__
         assert method.__doc__.strip() == (
             "Check equality and either forward a NotImplemented or\n"
-            "        return the result negated."
+            f"{indent}return the result negated."
         )
         assert method.__name__ == "__ne__"
 
@@ -465,7 +468,7 @@ def test_ne(self):
         method = self.cls.__ne__
         assert method.__doc__.strip() == (
             "Check equality and either forward a NotImplemented or\n"
-            "        return the result negated."
+            f"{indent}return the result negated."
         )
         assert method.__name__ == "__ne__"
 

tox.ini

@@ -2,8 +2,8 @@
 min_version = 4
 env_list =
     pre-commit,
-    py3{7,8,9,10,11,12}-tests,
-    py3{8,9,10,11,12}-mypy,
+    py3{7,8,9,10,11,12,13}-tests,
+    py3{8,9,10,11,12,13}-mypy,
     pypy3,
     pyright,
     docs,
@@ -41,7 +41,7 @@ commands = coverage run -m pytest {posargs:-n auto}
 [testenv:coverage-report]
 # Keep base_python in-sync with .python-version-default
 base_python = py312
-depends = py3{7,10,11}
+depends = py3{7,10,12}
 skip_install = true
 deps = coverage[toml]>=5.3
 commands =