Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies to Django 5.0 #547

Merged
merged 2 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
335 changes: 138 additions & 197 deletions poetry.lock

Large diffs are not rendered by default.

37 changes: 19 additions & 18 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,34 @@ authors = ["Job Doesburg <[email protected]>", "Lars van Rhijn <larsvanrhij
license = "MIT"

[tool.poetry.dependencies]
python = "^3.8.10"
django = "^4.2.10"
python = "^3.10"
django = "^5.0.3"
Pillow = "^10.2.0"
django-admin-autocomplete-filter = "^0.7.1"
django-import-export = "^3.0.2"
django-import-export = "^3.3.7"
requests = "^2.31.0"
spotipy = "^2.22.1"
coverage = "^6.5.0"
django-guardian = "^2.3.0"
djangorestframework = "^3.12.2"
django-oauth-toolkit = "^2.2.0"
django-cors-headers = "^3.6.0"
django-guardian = "^2.3.0" # Does not support Django >= 4.0.
djangorestframework = "^3.15.0"
django-oauth-toolkit = "^2.3.0" # Does not have official support for Django 5.0 yet.
django-cors-headers = "^4.3.1"
uritemplate = "^4.1.1"
django-autocompletefilter = "^0.0.8"
django-bootstrap5 = "^23.3"
django-filter = "21.1"
django-constance = {extras = ["database"], version = "^2.9.0"}
django-autocompletefilter = "^0.0.8" # No official support for Django >= 4.0.
django-bootstrap5 = "^23.4"
django-filter = "^24.1"
django-constance = {extras = ["database"], version = "^2.9.0"} # No official support for Django 5.0.
html2text = "^2020.1.16"
django-ical = "^1.8.3"
django-ical = "^1.9.2" # No official support for Django 5.0.
fontawesomefree = "^6.1.1"
django-tinymce = "^3.5.0"
django-tinymce = "^3.7.1"
bleach = { extras = ["css"], version = "^5.0.1" }
django-admin-rangefilter = "^0.9.0"
django-queryable-properties = "^1.8.3"
django-cron = "^0.6.0"
djangosaml2 = "^1.5.5"
django-model-utils = "^4.3.1"
django-admin-rangefilter = "^0.12.1"
django-queryable-properties = "^1.9.2"
django-cron = "^0.6.0" # No official support for Django 5.0.
djangosaml2 = "^1.9.2" # No official support for Django 5.0.
django-model-utils = "^4.4.0"
inflection = "^0.5.1"

[tool.poetry.group.dev.dependencies]
black = "^23.12.1"
Expand Down
4 changes: 2 additions & 2 deletions website/borrel/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ class BorrelReservationResource(resources.ModelResource):
venue_reservation__venue__name = Field(attribute="venue_reservation__venue__name", column_name="venue")
association__name = Field(attribute="association__name", column_name="association")

def __init__(self):
def __init__(self, **kwargs):
"""Initialize by creating a field for each product."""
super(BorrelReservationResource, self).__init__()
super(BorrelReservationResource, self).__init__(**kwargs)
self.added_product_fields = dict()

def before_export(self, queryset, *args, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions website/orders/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
class ShiftResource(resources.ModelResource):
"""Shift Resource."""

def __init__(self):
def __init__(self, **kwargs):
"""Initialize by creating a field for each product."""
super(ShiftResource, self).__init__()
super(ShiftResource, self).__init__(**kwargs)
self.added_product_fields = dict()

def before_export(self, queryset, *args, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion website/orders/templatetags/start_shift.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytz
from django import template
from django.conf import settings
from django.utils.datetime_safe import datetime
from datetime import datetime

from orders.models import OrderVenue
from orders.services import user_can_manage_shifts_in_venue
Expand Down
3 changes: 1 addition & 2 deletions website/thaliedje/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os
import secrets
import time
from datetime import timedelta
from datetime import timedelta, datetime

from constance import config
from django.templatetags.static import static
Expand All @@ -13,7 +13,6 @@
from django.db.models import F
from django.urls import reverse
from django.utils import timezone
from django.utils.datetime_safe import datetime
from model_utils.managers import InheritanceManager
from queryable_properties.managers import QueryablePropertiesManager
from queryable_properties.properties import RangeCheckProperty, AnnotationProperty, queryable_property
Expand Down
Loading