Skip to content

Commit e806d8d

Browse files
meshymeshy
authored
Merge pull request #259 from classy-python/bump-django
Upgrade Django 3.1.14 -> 5.2
2 parents 09325df + ddc7f6a commit e806d8d

15 files changed

+110
-97
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ default_language_version:
33
python: python3.10
44
repos:
55
- repo: https://github.com/adamchainz/django-upgrade
6-
rev: 1.17.0
6+
rev: 1.24.0
77
hooks:
88
- id: django-upgrade
9-
args: [--target-version, "3.1"]
9+
args: [--target-version, "5.2"]
1010

1111
- repo: https://github.com/ambv/black
1212
rev: 24.4.2

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ mypy:
2020

2121
build: _uv
2222
uv pip install -r requirements.prod.txt -r requirements.dev.txt
23+
rm -rf staticfiles/*
2324
python manage.py collectstatic --no-input
2425
rm -f ccbv.sqlite
2526
python manage.py migrate

‎core/settings.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,21 @@
4747
WSGI_APPLICATION = "core.wsgi.application"
4848

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

5152
LANGUAGE_CODE = "en"
5253
TIME_ZONE = "Europe/London"
5354
USE_I18N = False
54-
USE_L10N = False
5555
USE_TZ = False
5656

5757
STATIC_ROOT = BASE_DIR / "staticfiles"
5858
STATIC_URL = "/static/"
59-
STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
59+
60+
STORAGES = {
61+
"staticfiles": {
62+
"BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
63+
},
64+
}
6065

6166
CBV_SOURCES = {
6267
"django.views.generic": "Generic",

‎requirements.dev.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ types-requests==2.27.7
6969
types-urllib3==1.26.7
7070
# via types-requests
7171
typing-extensions==4.13.2
72-
# via mypy
72+
# via
73+
# -c requirements.prod.txt
74+
# mypy
7375
virtualenv==20.30.0
7476
# via pre-commit

‎requirements.prod.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
attrs>=21.4.0
22
blessings
3-
django~=3.1.14
3+
django
44
django-extensions
55
django-pygmy
66
django-sans-db>=1.2.0

‎requirements.prod.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# uv pip compile requirements.prod.in --output-file=requirements.prod.txt
33
alabaster==1.0.0
44
# via sphinx
5-
asgiref==3.4.1
5+
asgiref==3.8.1
66
# via django
77
attrs==21.4.0
88
# via -r requirements.prod.in
@@ -18,7 +18,7 @@ dj-database-url==0.5.0
1818
# via environs
1919
dj-email-url==1.0.6
2020
# via environs
21-
django==3.1.14
21+
django==5.2
2222
# via
2323
# -r requirements.prod.in
2424
# django-extensions
@@ -59,8 +59,6 @@ pygments==2.19.1
5959
# sphinx
6060
python-dotenv==0.21.0
6161
# via environs
62-
pytz==2021.3
63-
# via django
6462
requests==2.32.3
6563
# via
6664
# -r requirements.prod.in
@@ -87,6 +85,8 @@ sqlparse==0.5.3
8785
# via django
8886
tomli==2.2.1
8987
# via sphinx
88+
typing-extensions==4.13.2
89+
# via asgiref
9090
urllib3==2.4.0
9191
# via requests
9292
werkzeug==3.1.3

‎tests/_page_snapshots/fuzzy-klass-detail-old.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1515

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

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

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

@@ -1619,9 +1619,9 @@ <h3>
16191619

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

@@ -1637,8 +1637,8 @@ <h3>
16371637
});
16381638
})
16391639
</script>
1640-
<script src="/ccbv.js"></script>
1641-
<script src="/permalinks.js"></script>
1640+
<script src="/static/ccbv.556f6e68fbfa.js"></script>
1641+
<script src="/static/permalinks.5a142123389c.js"></script>
16421642

16431643
</body>
16441644
</html>

‎tests/_page_snapshots/fuzzy-klass-detail.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1515

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

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

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

@@ -1627,9 +1627,9 @@ <h3>
16271627

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

@@ -1645,8 +1645,8 @@ <h3>
16451645
});
16461646
})
16471647
</script>
1648-
<script src="/ccbv.js"></script>
1649-
<script src="/permalinks.js"></script>
1648+
<script src="/static/ccbv.556f6e68fbfa.js"></script>
1649+
<script src="/static/permalinks.5a142123389c.js"></script>
16501650

16511651
</body>
16521652
</html>

‎tests/_page_snapshots/fuzzy-module-detail.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

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

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

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

@@ -429,9 +429,9 @@ <h1>django.views.generic.edit</h1>
429429

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

‎tests/_page_snapshots/homepage.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

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

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

2121

2222

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

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

938-
<script src="/ccbv.js"></script>
939-
<script src="/bootstrap-tooltip.js"></script>
938+
<script src="/static/ccbv.556f6e68fbfa.js"></script>
939+
<script src="/static/bootstrap-tooltip.cbba0d4d7ed3.js"></script>
940940
<script>
941941
$( function (){
942942
CCBV.klass_list.hide_secondary();

0 commit comments

Comments
 (0)