From 91a569026bf147f144ea39920a8089f341b38336 Mon Sep 17 00:00:00 2001 From: Pierre-Yves David <pierre-yves.david@ens-lyon.org> Date: Fri, 24 May 2024 16:23:52 +0200 Subject: [PATCH] enum-deprecation: stop wrongly using deprecated As for the previous commit, using deprecated actually change the source Class leading all usage to raise deprecation warning. So we have to remove the deprecated and keep the compatibility silently for a small while. --- swh/model/model.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/swh/model/model.py b/swh/model/model.py index 22b2d985..078b6053 100644 --- a/swh/model/model.py +++ b/swh/model/model.py @@ -41,7 +41,6 @@ from attr._make import _AndValidator from attr.validators import and_ from attrs_strict import AttributeTypeError import dateutil.parser -from deprecated import deprecated import iso8601 from typing_extensions import Final @@ -987,9 +986,10 @@ class SnapshotTargetType(Enum): return f"SnapshotTargetType.{self.name}" -TargetType = deprecated(version="v6.13.0", reason="Use model.SnapshotTargetType")( - SnapshotTargetType -) +# Remove this compatibility trick once all user have been migrated. +# +# We cannot use @deprecated as this would modify SnapshotTargetType directly +TargetType = SnapshotTargetType class ReleaseTargetType(Enum): @@ -1005,9 +1005,10 @@ class ReleaseTargetType(Enum): return f"ReleaseTargetType.{self.name}" -ObjectType = deprecated(version="v6.13.0", reason="Use model.ReleaseTargetType")( - ReleaseTargetType -) +# Remove this compatibility trick once all user have been migrated. +# +# We cannot use @deprecated as this would modify SnapshotTargetType directly +ObjectType = ReleaseTargetType @attr.s(frozen=True, slots=True, field_transformer=optimize_all_validators) -- GitLab