diff --git a/pyproject.toml b/pyproject.toml index 2f40bf6..69abb26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,47 +4,43 @@ version = '0.4.0' description = 'Simple shift management system' readme = 'README.md' requires-python = '>=3.9' -authors = [ - { name = 'HaDiKo e.V. HaDiNet', email = 'software@hadiko.de' }, -] +authors = [{ name = 'HaDiKo e. V. - HaDiNet', email = 'software@hadiko.de' }] classifiers = [ - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3 :: Only', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ] dependencies = [ - 'Authlib==1.3.0', - 'Django==4.2.9', - 'django-auth-ldap==4.6.0', - 'django-bootstrap5==23.4', - 'django-colorfield==0.11.0', - 'django-ical==1.9.2', - 'django-phonenumber-field[phonenumberslite]==7.3.0', - 'gunicorn==21.2.0', - 'holidays==0.40', - 'icalendar==5.0.11', - 'Pillow==10.4.0', - 'psycopg2-binary==2.9.10', - 'python-dateutil==2.8.2', - 'requests==2.31.0', + 'Authlib==1.4.1', + 'Django==5.2.3', + 'django-auth-ldap==5.2.0', + 'django-bootstrap5==25.1', + 'django-colorfield==0.14.0', + 'django-ical==1.9.2', + 'django-phonenumber-field[phonenumberslite]==8.1.0', + 'gunicorn==23.0.0', + 'holidays==0.75', + 'icalendar==6.3.1', + 'Pillow==11.2.1', + 'psycopg2-binary==2.9.10', + 'python-dateutil==2.9.0.post0', + 'requests==2.32.4', ] [project.optional-dependencies] tests = [ - 'django-stubs==4.2.7', - 'types-python-dateutil==2.8.19.14', - 'types-requests==2.31.0.10', - 'mypy==1.8.0', -] -docs = [ - 'mkdocs==1.4.2', - 'mkdocs-material==9.0.11', + 'django-stubs==4.2.7', + 'types-python-dateutil==2.8.19.14', + 'types-requests==2.31.0.10', + 'mypy==1.8.0', ] +docs = ['mkdocs==1.4.2', 'mkdocs-material==9.0.11'] + [project.urls] repository = 'https://github.com/HaDiNet/shiftings' diff --git a/src/shiftings/events/models/event.py b/src/shiftings/events/models/event.py index c506288..e5c5ca8 100644 --- a/src/shiftings/events/models/event.py +++ b/src/shiftings/events/models/event.py @@ -44,7 +44,7 @@ class Meta: ordering = ['name', 'start_date', 'end_date', 'organization'] constraints = [ models.CheckConstraint(name='event_start_after_end', - check=models.Q(start_date__lte=models.F('end_date'))) + condition=models.Q(start_date__lte=models.F('end_date'))) ] def __str__(self) -> str: diff --git a/src/shiftings/organizations/models/membership.py b/src/shiftings/organizations/models/membership.py index fc523e2..f843813 100644 --- a/src/shiftings/organizations/models/membership.py +++ b/src/shiftings/organizations/models/membership.py @@ -42,9 +42,9 @@ class Meta: UniqueConstraint(fields=['organization', 'name'], name='name_unique_per_organization'), UniqueConstraint(fields=['organization', 'admin'], name='admin_unique_per_organization'), UniqueConstraint(fields=['organization', 'default'], name='default_unique_per_organization'), - CheckConstraint(check=~Q(admin=False), name='admin_true_or_null'), - CheckConstraint(check=~Q(default=False), name='default_true_or_null'), - CheckConstraint(check=(Q(admin=True, default__isnull=True) | Q(admin__isnull=True)), + CheckConstraint(condition=~Q(admin=False), name='admin_true_or_null'), + CheckConstraint(condition=~Q(default=False), name='default_true_or_null'), + CheckConstraint(condition=(Q(admin=True, default__isnull=True) | Q(admin__isnull=True)), name='admin_not_default') ] @@ -76,7 +76,7 @@ class Meta: UniqueConstraint(fields=['organization', 'type', 'user'], name='unique_membership_organization_type_user'), UniqueConstraint(fields=['organization', 'type', 'group'], name='unique_membership_organization_type_group'), - CheckConstraint(check=(~(Q(user__isnull=True) & Q(group__isnull=True))), name='group_or_user') + CheckConstraint(condition=(~(Q(user__isnull=True) & Q(group__isnull=True))), name='group_or_user') ] def __str__(self) -> str: diff --git a/src/shiftings/shifts/models/base.py b/src/shiftings/shifts/models/base.py index 7d064af..b99bd70 100644 --- a/src/shiftings/shifts/models/base.py +++ b/src/shiftings/shifts/models/base.py @@ -27,6 +27,6 @@ class Meta: abstract = True default_permissions = () constraints = [ - models.CheckConstraint(check=Q(max_users=0) | Q(max_users__gte=F('required_users')), + models.CheckConstraint(condition=Q(max_users=0) | Q(max_users__gte=F('required_users')), name='shift_max_users_gte_required_users') ] diff --git a/src/shiftings/shifts/models/shift.py b/src/shiftings/shifts/models/shift.py index 1157b7e..d9aabd3 100644 --- a/src/shiftings/shifts/models/shift.py +++ b/src/shiftings/shifts/models/shift.py @@ -46,7 +46,7 @@ class Meta: default_permissions = () ordering = ['start', 'end', 'name', 'organization'] constraints = [ - models.CheckConstraint(check=Q(start__lte=F('end')), name='shift_start_before_end') + models.CheckConstraint(condition=Q(start__lte=F('end')), name='shift_start_before_end') ] def clean(self) -> None: