csu 2.5.7__tar.gz → 2.6.0__tar.gz

{csu-2.5.7 → csu-2.6.0}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.7
+current_version = 2.6.0
 commit = True
 tag = True
 

{csu-2.5.7 → csu-2.6.0}/.cookiecutterrc

@@ -41,7 +41,7 @@ default_context:
     sphinx_theme: furo
     test_matrix_separate_coverage: false
     tests_inside_package: true
-    version: 2.5.7
+    version: 2.6.0
     version_manager: bump2version
     website: https://blog.ionelmc.ro
     year_from: '2024'

{csu-2.5.7 → csu-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.5.7
+Version: 2.6.0
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -69,9 +69,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.7.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.5.7...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.0...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.5.7 → csu-2.6.0}/README.rst

@@ -34,9 +34,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.7.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.5.7...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.0...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.5.7 → csu-2.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csu"
-version = "2.5.7"
+version = "2.6.0"
 description = "Clean Slate Utils - bunch of utility code, mostly Django/DRF specific."
 requires-python = ">=3.14"
 license = "BSD-2-Clause"

{csu-2.5.7 → csu-2.6.0}/src/csu/__init__.py

@@ -2,4 +2,4 @@
 a.k.a Clean Slate Utils
 """
 
-__version__ = "2.5.7"
+__version__ = "2.6.0"

{csu-2.5.7 → csu-2.6.0}/src/csu/drf/fields.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from datetime import date
 from zoneinfo import ZoneInfo
 
@@ -209,15 +210,14 @@ class EnumField(ChoiceField):
 
 
 class FormattedField(ReadOnlyField):
-    format: str
+    format_func: Callable
 
-    def __init__(self, *, format=None, **kwargs):
-        self.format = format
+    def __init__(self, *, format: Callable | str, **kwargs):
+        self.format_func = format.format if isinstance(format, str) else format
         super().__init__(**kwargs, read_only=True)
 
     def to_representation(self, value):
-        # noinspection StrFormat
-        return self.format.format(value)
+        return self.format_func(value)
 
 
 class DispatchingHyperlinkedRelatedField(HyperlinkedRelatedField):

{csu-2.5.7 → csu-2.6.0}/src/csu/locale/ro/LC_MESSAGES/django.po

@@ -170,7 +170,7 @@ msgid "confirmed at"
 msgstr "confirmat la"
 
 #: src/csu/models.py:66
-msgid "cancelled at"
+msgid "canceled at"
 msgstr "anulat la"
 
 #: src/csu/models.py:113

{csu-2.5.7 → csu-2.6.0}/src/csu/models.py

@@ -43,7 +43,7 @@ class AbstractStatusEnum(models.Choices):
     pending = object()
     confirmed = object()
     expired = object()
-    cancelled = object()
+    canceled = object()
 
 
 class BaseStatusModel(BaseModel):
@@ -62,8 +62,8 @@ class BaseStatusModel(BaseModel):
         db_index=True,
         editable=False,
     )
-    cancelled_at = models.DateTimeField(
-        verbose_name=_("cancelled at"),
+    canceled_at = models.DateTimeField(
+        verbose_name=_("canceled at"),
         null=True,
         default=None,
         db_index=True,
@@ -85,8 +85,8 @@ class BaseStatusModel(BaseModel):
         return self.status == self.status_enum_class.confirmed
 
     @property
-    def is_cancelled(self):
-        return self.status == self.status_enum_class.cancelled
+    def is_canceled(self):
+        return self.status == self.status_enum_class.canceled
 
     def can_cancel(self):
         return not self.is_confirmed

{csu-2.5.7 → csu-2.6.0}/src/csu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.5.7
+Version: 2.6.0
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -69,9 +69,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.5.7.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.5.7...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.0...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/