Skip to content

Upgrade Django 3.1.14 -> 5.2 #259

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.

Sign up for GitHub

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

Merged
meshy merged 7 commits into from
Apr 28, 2025
Merged

Upgrade Django 3.1.14 -> 5.2 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0be96b0
Upgrade Django 3.1.14 -> 3.2.25
ghickman Apr 26, 2025
11d54f2
Upgrade Django 3.2.25 -> 4.0.20
ghickman Apr 26, 2025
5ca7c01
Upgrade Django 4.0.10 -> 4.1.13
ghickman Apr 26, 2025
e7ef3ac
Upgrade Django 4.1.13 -> 4.2.20
ghickman Apr 26, 2025
3bc31fa
Upgrade Django 4.2.20 -> 5.0.14
ghickman Apr 26, 2025
e94999a
Upgrade Django 5.0.14 -> 5.1.8
ghickman Apr 26, 2025
ddc7f6a
Upgrade Django 5.1.8 -> 5.2
ghickman Apr 26, 2025
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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ default_language_version:
python: python3.10
repos:
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.17.0
rev: 1.24.0
hooks:
- id: django-upgrade
args: [--target-version, "3.1"]
args: [--target-version, "5.2"]

- repo: https://github.com/ambv/black
rev: 24.4.2
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ mypy:

build: _uv
uv pip install -r requirements.prod.txt -r requirements.dev.txt
rm -rf staticfiles/*
python manage.py collectstatic --no-input
rm -f ccbv.sqlite
python manage.py migrate
Expand Down
9 changes: 7 additions & 2 deletions core/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,21 @@
WSGI_APPLICATION = "core.wsgi.application"

DATABASES = {"default": env.dj_db_url("DATABASE_URL", default="sqlite:///ccbv.sqlite")}
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

LANGUAGE_CODE = "en"
TIME_ZONE = "Europe/London"
USE_I18N = False
USE_L10N = False
USE_TZ = False

STATIC_ROOT = BASE_DIR / "staticfiles"
STATIC_URL = "/static/"
STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"

STORAGES = {
"staticfiles": {
"BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
},
}

CBV_SOURCES = {
"django.views.generic": "Generic",
Expand Down
4 changes: 3 additions & 1 deletion requirements.dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ types-requests==2.27.7
types-urllib3==1.26.7
# via types-requests
typing-extensions==4.13.2
# via mypy
# via
# -c requirements.prod.txt
# mypy
virtualenv==20.30.0
# via pre-commit
2 changes: 1 addition & 1 deletion requirements.prod.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
attrs>=21.4.0
blessings
django~=3.1.14
django
django-extensions
django-pygmy
django-sans-db>=1.2.0
Expand Down
8 changes: 4 additions & 4 deletions requirements.prod.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# uv pip compile requirements.prod.in --output-file=requirements.prod.txt
alabaster==1.0.0
# via sphinx
asgiref==3.4.1
asgiref==3.8.1
# via django
attrs==21.4.0
# via -r requirements.prod.in
Expand All @@ -18,7 +18,7 @@ dj-database-url==0.5.0
# via environs
dj-email-url==1.0.6
# via environs
django==3.1.14
django==5.2
# via
# -r requirements.prod.in
# django-extensions
Expand Down Expand Up @@ -57,8 +57,6 @@ pygments==2.19.1
# sphinx
python-dotenv==0.21.0
# via environs
pytz==2021.3
# via django
requests==2.32.3
# via
# -r requirements.prod.in
Expand All @@ -85,6 +83,8 @@ sqlparse==0.5.3
# via django
tomli==2.2.1
# via sphinx
typing-extensions==4.13.2
# via asgiref
urllib3==2.4.0
# via requests
werkzeug==2.0.2
Expand Down
22 changes: 11 additions & 11 deletions tests/_page_snapshots/fuzzy-klass-detail-old.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Favicon -->
<link rel="icon" href="/favicon/favicon.ico" sizes="48x48" />
<link rel="icon" href="/favicon/favicon.svg" sizes="any" type="image/svg+xml" />
<link rel="icon" href="/static/favicon/favicon.5c7d24511fd2.ico" sizes="48x48" />
<link rel="icon" href="/static/favicon/favicon.2dfaf5d0eabe.svg" sizes="any" type="image/svg+xml" />

<!-- Le styles from Twitter Bootstrap-->
<link href="/bootstrap.css" rel="stylesheet">
<link href="/bootstrap-responsive.css" rel="stylesheet">
<link href="/style.css" rel="stylesheet">
<link href="/manni.css" rel="stylesheet">
<link href="/static/bootstrap.5fbf7522f237.css" rel="stylesheet">
<link href="/static/bootstrap-responsive.f9dee47322d8.css" rel="stylesheet">
<link href="/static/style.24cb8a14e5e0.css" rel="stylesheet">
<link href="/static/manni.59a8b2db886d.css" rel="stylesheet">

<link rel="canonical" href="http://testserver/projects/Django/4.0/django.views.generic.edit/FormView/">

Expand Down Expand Up @@ -1619,9 +1619,9 @@ <h3>

</div> <!-- /container -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/jquery-1.7.1.min.js"><\/script>');</script>
<script src="/modernizr-2.5.3.min.js"></script>
<script src="/bootstrap-dropdowns.js"></script>
<script>window.jQuery || document.write('<script src="/static/jquery-1.7.1.min.ddb84c158728.js"><\/script>');</script>
<script src="/static/modernizr-2.5.3.min.0f9fe98fcfda.js"></script>
<script src="/static/bootstrap-dropdowns.09dbe8df198f.js"></script>
<script>$('.dropdown-toggle').dropdown()</script>
<script type="text/javascript">$('.dropdown-toggle').dropdown()</script>

Expand All @@ -1637,8 +1637,8 @@ <h3>
});
})
</script>
<script src="/ccbv.js"></script>
<script src="/permalinks.js"></script>
<script src="/static/ccbv.556f6e68fbfa.js"></script>
<script src="/static/permalinks.5a142123389c.js"></script>

</body>
</html>
22 changes: 11 additions & 11 deletions tests/_page_snapshots/fuzzy-klass-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Favicon -->
<link rel="icon" href="/favicon/favicon.ico" sizes="48x48" />
<link rel="icon" href="/favicon/favicon.svg" sizes="any" type="image/svg+xml" />
<link rel="icon" href="/static/favicon/favicon.5c7d24511fd2.ico" sizes="48x48" />
<link rel="icon" href="/static/favicon/favicon.2dfaf5d0eabe.svg" sizes="any" type="image/svg+xml" />

<!-- Le styles from Twitter Bootstrap-->
<link href="/bootstrap.css" rel="stylesheet">
<link href="/bootstrap-responsive.css" rel="stylesheet">
<link href="/style.css" rel="stylesheet">
<link href="/manni.css" rel="stylesheet">
<link href="/static/bootstrap.5fbf7522f237.css" rel="stylesheet">
<link href="/static/bootstrap-responsive.f9dee47322d8.css" rel="stylesheet">
<link href="/static/style.24cb8a14e5e0.css" rel="stylesheet">
<link href="/static/manni.59a8b2db886d.css" rel="stylesheet">

<link rel="canonical" href="http://testserver/projects/Django/4.0/django.views.generic.edit/FormView/">

Expand Down Expand Up @@ -1627,9 +1627,9 @@ <h3>

</div> <!-- /container -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/jquery-1.7.1.min.js"><\/script>');</script>
<script src="/modernizr-2.5.3.min.js"></script>
<script src="/bootstrap-dropdowns.js"></script>
<script>window.jQuery || document.write('<script src="/static/jquery-1.7.1.min.ddb84c158728.js"><\/script>');</script>
<script src="/static/modernizr-2.5.3.min.0f9fe98fcfda.js"></script>
<script src="/static/bootstrap-dropdowns.09dbe8df198f.js"></script>
<script>$('.dropdown-toggle').dropdown()</script>
<script type="text/javascript">$('.dropdown-toggle').dropdown()</script>

Expand All @@ -1645,8 +1645,8 @@ <h3>
});
})
</script>
<script src="/ccbv.js"></script>
<script src="/permalinks.js"></script>
<script src="/static/ccbv.556f6e68fbfa.js"></script>
<script src="/static/permalinks.5a142123389c.js"></script>

</body>
</html>
18 changes: 9 additions & 9 deletions tests/_page_snapshots/fuzzy-module-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Favicon -->
<link rel="icon" href="/favicon/favicon.ico" sizes="48x48" />
<link rel="icon" href="/favicon/favicon.svg" sizes="any" type="image/svg+xml" />
<link rel="icon" href="/static/favicon/favicon.5c7d24511fd2.ico" sizes="48x48" />
<link rel="icon" href="/static/favicon/favicon.2dfaf5d0eabe.svg" sizes="any" type="image/svg+xml" />

<!-- Le styles from Twitter Bootstrap-->
<link href="/bootstrap.css" rel="stylesheet">
<link href="/bootstrap-responsive.css" rel="stylesheet">
<link href="/style.css" rel="stylesheet">
<link href="/manni.css" rel="stylesheet">
<link href="/static/bootstrap.5fbf7522f237.css" rel="stylesheet">
<link href="/static/bootstrap-responsive.f9dee47322d8.css" rel="stylesheet">
<link href="/static/style.24cb8a14e5e0.css" rel="stylesheet">
<link href="/static/manni.59a8b2db886d.css" rel="stylesheet">

<link rel="canonical" href="http://testserver/projects/Django/4.0/django.views.generic.edit/">

Expand Down Expand Up @@ -429,9 +429,9 @@ <h1>django.views.generic.edit</h1>

</div> <!-- /container -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/jquery-1.7.1.min.js"><\/script>');</script>
<script src="/modernizr-2.5.3.min.js"></script>
<script src="/bootstrap-dropdowns.js"></script>
<script>window.jQuery || document.write('<script src="/static/jquery-1.7.1.min.ddb84c158728.js"><\/script>');</script>
<script src="/static/modernizr-2.5.3.min.0f9fe98fcfda.js"></script>
<script src="/static/bootstrap-dropdowns.09dbe8df198f.js"></script>
<script>$('.dropdown-toggle').dropdown()</script>
<script type="text/javascript">$('.dropdown-toggle').dropdown()</script>

Expand Down
22 changes: 11 additions & 11 deletions tests/_page_snapshots/homepage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Favicon -->
<link rel="icon" href="/favicon/favicon.ico" sizes="48x48" />
<link rel="icon" href="/favicon/favicon.svg" sizes="any" type="image/svg+xml" />
<link rel="icon" href="/static/favicon/favicon.5c7d24511fd2.ico" sizes="48x48" />
<link rel="icon" href="/static/favicon/favicon.2dfaf5d0eabe.svg" sizes="any" type="image/svg+xml" />

<!-- Le styles from Twitter Bootstrap-->
<link href="/bootstrap.css" rel="stylesheet">
<link href="/bootstrap-responsive.css" rel="stylesheet">
<link href="/style.css" rel="stylesheet">
<link href="/manni.css" rel="stylesheet">
<link href="/static/bootstrap.5fbf7522f237.css" rel="stylesheet">
<link href="/static/bootstrap-responsive.f9dee47322d8.css" rel="stylesheet">
<link href="/static/style.24cb8a14e5e0.css" rel="stylesheet">
<link href="/static/manni.59a8b2db886d.css" rel="stylesheet">



Expand Down Expand Up @@ -929,14 +929,14 @@ <h2>How does this site help?</h2>

</div> <!-- /container -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/jquery-1.7.1.min.js"><\/script>');</script>
<script src="/modernizr-2.5.3.min.js"></script>
<script src="/bootstrap-dropdowns.js"></script>
<script>window.jQuery || document.write('<script src="/static/jquery-1.7.1.min.ddb84c158728.js"><\/script>');</script>
<script src="/static/modernizr-2.5.3.min.0f9fe98fcfda.js"></script>
<script src="/static/bootstrap-dropdowns.09dbe8df198f.js"></script>
<script>$('.dropdown-toggle').dropdown()</script>
<script type="text/javascript">$('.dropdown-toggle').dropdown()</script>

<script src="/ccbv.js"></script>
<script src="/bootstrap-tooltip.js"></script>
<script src="/static/ccbv.556f6e68fbfa.js"></script>
<script src="/static/bootstrap-tooltip.cbba0d4d7ed3.js"></script>
<script>
$( function (){
CCBV.klass_list.hide_secondary();
Expand Down
22 changes: 11 additions & 11 deletions tests/_page_snapshots/klass-detail-old.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Favicon -->
<link rel="icon" href="/favicon/favicon.ico" sizes="48x48" />
<link rel="icon" href="/favicon/favicon.svg" sizes="any" type="image/svg+xml" />
<link rel="icon" href="/static/favicon/favicon.5c7d24511fd2.ico" sizes="48x48" />
<link rel="icon" href="/static/favicon/favicon.2dfaf5d0eabe.svg" sizes="any" type="image/svg+xml" />

<!-- Le styles from Twitter Bootstrap-->
<link href="/bootstrap.css" rel="stylesheet">
<link href="/bootstrap-responsive.css" rel="stylesheet">
<link href="/style.css" rel="stylesheet">
<link href="/manni.css" rel="stylesheet">
<link href="/static/bootstrap.5fbf7522f237.css" rel="stylesheet">
<link href="/static/bootstrap-responsive.f9dee47322d8.css" rel="stylesheet">
<link href="/static/style.24cb8a14e5e0.css" rel="stylesheet">
<link href="/static/manni.59a8b2db886d.css" rel="stylesheet">

<link rel="canonical" href="http://testserver/projects/Django/4.0/django.views.generic.edit/FormView/">

Expand Down Expand Up @@ -1615,9 +1615,9 @@ <h3>

</div> <!-- /container -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/jquery-1.7.1.min.js"><\/script>');</script>
<script src="/modernizr-2.5.3.min.js"></script>
<script src="/bootstrap-dropdowns.js"></script>
<script>window.jQuery || document.write('<script src="/static/jquery-1.7.1.min.ddb84c158728.js"><\/script>');</script>
<script src="/static/modernizr-2.5.3.min.0f9fe98fcfda.js"></script>
<script src="/static/bootstrap-dropdowns.09dbe8df198f.js"></script>
<script>$('.dropdown-toggle').dropdown()</script>
<script type="text/javascript">$('.dropdown-toggle').dropdown()</script>

Expand All @@ -1633,8 +1633,8 @@ <h3>
});
})
</script>
<script src="/ccbv.js"></script>
<script src="/permalinks.js"></script>
<script src="/static/ccbv.556f6e68fbfa.js"></script>
<script src="/static/permalinks.5a142123389c.js"></script>

</body>
</html>
22 changes: 11 additions & 11 deletions tests/_page_snapshots/klass-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Favicon -->
<link rel="icon" href="/favicon/favicon.ico" sizes="48x48" />
<link rel="icon" href="/favicon/favicon.svg" sizes="any" type="image/svg+xml" />
<link rel="icon" href="/static/favicon/favicon.5c7d24511fd2.ico" sizes="48x48" />
<link rel="icon" href="/static/favicon/favicon.2dfaf5d0eabe.svg" sizes="any" type="image/svg+xml" />

<!-- Le styles from Twitter Bootstrap-->
<link href="/bootstrap.css" rel="stylesheet">
<link href="/bootstrap-responsive.css" rel="stylesheet">
<link href="/style.css" rel="stylesheet">
<link href="/manni.css" rel="stylesheet">
<link href="/static/bootstrap.5fbf7522f237.css" rel="stylesheet">
<link href="/static/bootstrap-responsive.f9dee47322d8.css" rel="stylesheet">
<link href="/static/style.24cb8a14e5e0.css" rel="stylesheet">
<link href="/static/manni.59a8b2db886d.css" rel="stylesheet">

<link rel="canonical" href="http://testserver/projects/Django/4.0/django.views.generic.edit/FormView/">

Expand Down Expand Up @@ -1623,9 +1623,9 @@ <h3>

</div> <!-- /container -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/jquery-1.7.1.min.js"><\/script>');</script>
<script src="/modernizr-2.5.3.min.js"></script>
<script src="/bootstrap-dropdowns.js"></script>
<script>window.jQuery || document.write('<script src="/static/jquery-1.7.1.min.ddb84c158728.js"><\/script>');</script>
<script src="/static/modernizr-2.5.3.min.0f9fe98fcfda.js"></script>
<script src="/static/bootstrap-dropdowns.09dbe8df198f.js"></script>
<script>$('.dropdown-toggle').dropdown()</script>
<script type="text/javascript">$('.dropdown-toggle').dropdown()</script>

Expand All @@ -1641,8 +1641,8 @@ <h3>
});
})
</script>
<script src="/ccbv.js"></script>
<script src="/permalinks.js"></script>
<script src="/static/ccbv.556f6e68fbfa.js"></script>
<script src="/static/permalinks.5a142123389c.js"></script>

</body>
</html>
18 changes: 9 additions & 9 deletions tests/_page_snapshots/module-detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Favicon -->
<link rel="icon" href="/favicon/favicon.ico" sizes="48x48" />
<link rel="icon" href="/favicon/favicon.svg" sizes="any" type="image/svg+xml" />
<link rel="icon" href="/static/favicon/favicon.5c7d24511fd2.ico" sizes="48x48" />
<link rel="icon" href="/static/favicon/favicon.2dfaf5d0eabe.svg" sizes="any" type="image/svg+xml" />

<!-- Le styles from Twitter Bootstrap-->
<link href="/bootstrap.css" rel="stylesheet">
<link href="/bootstrap-responsive.css" rel="stylesheet">
<link href="/style.css" rel="stylesheet">
<link href="/manni.css" rel="stylesheet">
<link href="/static/bootstrap.5fbf7522f237.css" rel="stylesheet">
<link href="/static/bootstrap-responsive.f9dee47322d8.css" rel="stylesheet">
<link href="/static/style.24cb8a14e5e0.css" rel="stylesheet">
<link href="/static/manni.59a8b2db886d.css" rel="stylesheet">

<link rel="canonical" href="http://testserver/projects/Django/4.0/django.views.generic.edit/">

Expand Down Expand Up @@ -425,9 +425,9 @@ <h1>django.views.generic.edit</h1>

</div> <!-- /container -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/jquery-1.7.1.min.js"><\/script>');</script>
<script src="/modernizr-2.5.3.min.js"></script>
<script src="/bootstrap-dropdowns.js"></script>
<script>window.jQuery || document.write('<script src="/static/jquery-1.7.1.min.ddb84c158728.js"><\/script>');</script>
<script src="/static/modernizr-2.5.3.min.0f9fe98fcfda.js"></script>
<script src="/static/bootstrap-dropdowns.09dbe8df198f.js"></script>
<script>$('.dropdown-toggle').dropdown()</script>
<script type="text/javascript">$('.dropdown-toggle').dropdown()</script>

Expand Down
Loading