From 8e1405af80b9d9041ba1da7806e6c694bf6a8f85 Mon Sep 17 00:00:00 2001
From: Frederik Hennig <frederik.hennig@fau.de>
Date: Wed, 29 Jan 2025 14:17:22 +0100
Subject: [PATCH] fix mutable defaults error with Category descriptor and
Python 3.12
---
noxfile.py | 2 +-
src/pystencils/codegen/config.py | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/noxfile.py b/noxfile.py
index 1b882478a..11b3731ec 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -86,8 +86,8 @@ def typecheck(session: nox.Session):
session.run("mypy", "src/pystencils")
+@nox.session(python=["3.10", "3.12", "3.13"], tags=["test"])
@nox.parametrize("cupy_version", [None, "12", "13"], ids=["cpu", "cupy12", "cupy13"])
-@nox.session(python="3.10", tags=["test"])
def testsuite(session: nox.Session, cupy_version: str | None):
if cupy_version is not None:
install_cupy(session, cupy_version, skip_if_no_cuda=True)
diff --git a/src/pystencils/codegen/config.py b/src/pystencils/codegen/config.py
index cbb3f4f32..d56fe6642 100644
--- a/src/pystencils/codegen/config.py
+++ b/src/pystencils/codegen/config.py
@@ -196,12 +196,16 @@ class Category(Generic[Category_T]):
def __get__(self, obj: ConfigBase, objtype: type[ConfigBase] | None = None) -> Category_T:
if obj is None:
- return self._default
+ return None
- return cast(Category_T, getattr(obj, self._lookup, None))
+ cat = getattr(obj, self._lookup, None)
+ if cat is None:
+ cat = self._default.copy()
+ setattr(obj, self._lookup, cat)
+ return cast(Category_T, cat)
- def __set__(self, obj: ConfigBase, cat: Category_T):
- setattr(obj, self._lookup, cat.copy())
+ def __set__(self, obj: ConfigBase, cat: Category_T | None):
+ setattr(obj, self._lookup, cat.copy() if cat is not None else None)
class _AUTO_TYPE: ... # noqa: E701
--
GitLab