Skip to content

Commit

Permalink
fix: Move to Django 5, Postgres 14, add DjDT
Browse files Browse the repository at this point in the history
  • Loading branch information
dragonee committed Sep 18, 2024
1 parent 33e590d commit a68263a
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion docker/development/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ networks:

services:
tasks-db:
image: postgres:12-alpine
image: postgres:14-alpine
environment:
POSTGRES_PASSWORD: secret
POSTGRES_USER: tasks
Expand Down
7 changes: 3 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
pip==21.1
django==3.2.16
django==5.1.1
psycopg2-binary
django-crispy-forms==1.8.1
django-mail-templated==2.6.5
django-model-utils==4.0.0
django-extensions==2.2.5
djangorestframework==3.11.2
django-extensions==3.2.3
djangorestframework==3.15.1
unicode==2.7
Unidecode==1.1.1
django-filter==21.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/local.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-r base.txt
django-debug-toolbar==3.8.1
django-debug-toolbar==4.4.6
factory_boy==2.12.0
pytest==5.3.2
pytest-django==3.7.0
2 changes: 1 addition & 1 deletion tasks/apps/quests/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.db import models

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from django.urls import reverse

Expand Down
2 changes: 1 addition & 1 deletion tasks/apps/rewards/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.db import models

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _

from django.core.validators import MaxValueValidator, MinValueValidator

Expand Down
2 changes: 1 addition & 1 deletion tasks/apps/tree/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.db import models

from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django.utils.text import Truncator, slugify

from django.utils import timezone
Expand Down
1 change: 0 additions & 1 deletion tasks/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
'django.contrib.messages',
'django.contrib.staticfiles',

'crispy_forms',
'mail_templated',
'django_extensions',

Expand Down
4 changes: 2 additions & 2 deletions tasks/settings/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@

DEBUG = True

#INSTALLED_APPS += ('debug_toolbar',)
INSTALLED_APPS += ('debug_toolbar',)

DEBUG_TOOLBAR_PATCH_SETTINGS = False

VALIDATE_FRONT_PASSWORD = False

#MIDDLEWARE = ['debug_toolbar.middleware.DebugToolbarMiddleware', ] + MIDDLEWARE
MIDDLEWARE = ['debug_toolbar.middleware.DebugToolbarMiddleware', ] + MIDDLEWARE

STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'static', 'local')
Expand Down
20 changes: 9 additions & 11 deletions tasks/urls.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
from django.conf.urls import url, include
from django.conf.urls import include
from django.conf.urls.static import static
from django.urls import path
from django.urls import re_path
from django.contrib import admin
from django.conf import settings
from django.urls import reverse_lazy
from django.views.generic import RedirectView


urlpatterns = [
url(r'^admin/', admin.site.urls),
url(r'^rewards/', include('tasks.apps.rewards.urls')),
url(r'^quests/', include('tasks.apps.quests.urls')),
url(r'^', include('tasks.apps.tree.urls'))
re_path(r'^admin/', admin.site.urls),
re_path(r'^rewards/', include('tasks.apps.rewards.urls')),
re_path(r'^quests/', include('tasks.apps.quests.urls')),
re_path(r'^', include('tasks.apps.tree.urls'))
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)


# Debug Toolbar.
if settings.DEBUG:
import debug_toolbar
urlpatterns += [
url(r'^__debug__/', include(debug_toolbar.urls))
]
from debug_toolbar.toolbar import debug_toolbar_urls

urlpatterns += debug_toolbar_urls()

0 comments on commit a68263a

Please sign in to comment.