Skip to content

Commit eac774a

Browse files
Upgrade to Django 6 (#793)
* Upgrade to Django 6 * Upgrade requirements.txt dependencies * Upgrade stuff to work with newer Python 3.14 * Fix version incompatibilities * Fix version incompatibilities (pt 2)
1 parent 2f7e3e7 commit eac774a

6 files changed

Lines changed: 10 additions & 12 deletions

File tree

.github/workflows/run-unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Python
2020
uses: actions/setup-python@v5
2121
with:
22-
python-version: 3.11.4
22+
python-version: 3.14
2323
cache: 'pip'
2424

2525
- name: Install dependencies

.github/workflows/validate-language-info-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Python
2121
uses: actions/setup-python@v5
2222
with:
23-
python-version: 3.11.4
23+
python-version: 3.14
2424
cache: 'pip'
2525

2626
- name: Install dependencies

.github/workflows/validate-meta-info-file.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Python
2121
uses: actions/setup-python@v5
2222
with:
23-
python-version: 3.11.4
23+
python-version: 3.14
2424
cache: 'pip'
2525

2626
- name: Install dependencies

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12-slim
1+
FROM python:3.14-slim
22
ENV PYTHONBUFFERED=1
33
WORKDIR /code
44
RUN apt-get update && apt-get install -y --no-install-recommends \

codethesaurus/settings.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
Generated by 'django-admin startproject' using Django 3.1.1.
55
66
For more information on this file, see
7-
https://docs.djangoproject.com/en/3.1/topics/settings/
7+
https://docs.djangoproject.com/en/6.0/topics/settings/
88
99
For the full list of settings and their values, see
10-
https://docs.djangoproject.com/en/3.1/ref/settings/
10+
https://docs.djangoproject.com/en/6.0/ref/settings/
1111
"""
1212
from pathlib import Path
1313
import os
@@ -87,7 +87,7 @@
8787
WSGI_APPLICATION = 'codethesaurus.wsgi.application'
8888

8989
# Database
90-
# https://docs.djangoproject.com/en/3.1/ref/settings/#databases
90+
# https://docs.djangoproject.com/en/6.0/ref/settings/#databases
9191

9292
DATABASES = {
9393
'default': {
@@ -101,7 +101,7 @@
101101
DATABASES['default'].update(db_from_env)
102102

103103
# Password validation
104-
# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
104+
# https://docs.djangoproject.com/en/6.0/ref/settings/#auth-password-validators
105105

106106
AUTH_PASSWORD_VALIDATORS = [
107107
{
@@ -119,20 +119,18 @@
119119
]
120120

121121
# Internationalization
122-
# https://docs.djangoproject.com/en/3.1/topics/i18n/
122+
# https://docs.djangoproject.com/en/6.0/topics/i18n/
123123

124124
LANGUAGE_CODE = 'en-us'
125125

126126
TIME_ZONE = 'UTC'
127127

128128
USE_I18N = True
129129

130-
USE_L10N = True
131-
132130
USE_TZ = True
133131

134132
# Static files (CSS, JavaScript, Images)
135-
# https://docs.djangoproject.com/en/3.1/howto/static-files/
133+
# https://docs.djangoproject.com/en/6.0/howto/static-files/
136134
# https://dev.to/fazledyn/deploying-django-3-1-on-heroku-417
137135
# https://github.com/pkrefta/django-on-heroku/blob/3b2367fec9417230dbfba0235353403865386a41/django_on_heroku/core.py#L106
138136

requirements.txt

808 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)