Skip to content
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
8 changes: 4 additions & 4 deletions .github/workflows/coverage_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ jobs:
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'

- name: Update apt repo
run: sudo apt update
- name: Install libmemcached-dev for pylibmc
run: sudo apt install -y libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install dependencies
run: |
python -m pip install --upgrade pip wheel
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/data/apt-packages.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
gettext
libmemcached-dev
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
cache: 'pip'
cache-dependency-path: 'docs/requirements.txt'
- name: Install system spell checker
run: sudo apt update && sudo apt install -y aspell aspell-en
run: sudo apt update && sudo apt install -y --no-install-recommends aspell aspell-en
- run: python -m pip install -r requirements.txt
- name: Lint
run: make lint
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/postgis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ jobs:
activate-environment: geodjango
environment-file: ${{ matrix.conda-environment-file }}
channel-priority: strict
- name: Install libmemcached-dev for pylibmc
run: sudo apt install -y libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e .
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/python_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'
- name: Install libmemcached-dev for pylibmc
run: sudo apt-get install libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -e .
Expand Down
24 changes: 16 additions & 8 deletions .github/workflows/schedule_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ jobs:
with:
python-version: '3.14'
cache: 'pip'
- name: Install libmemcached-dev for pylibmc
run: sudo apt-get install libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install .
Expand Down Expand Up @@ -104,8 +106,10 @@ jobs:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'
- name: Install libmemcached-dev for pylibmc
run: sudo apt-get install libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -e .
Expand Down Expand Up @@ -143,8 +147,10 @@ jobs:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'
- name: Install libmemcached-dev for pylibmc
run: sudo apt-get install libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e .
Expand Down Expand Up @@ -191,8 +197,10 @@ jobs:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'
- name: Install libmemcached-dev for pylibmc
run: sudo apt-get install libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e .
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/screenshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'
- name: Update apt repo
run: sudo apt update
- name: Install libmemcached-dev for pylibmc
run: sudo apt install -y libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -e .
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/selenium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ jobs:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'
- name: Install libmemcached-dev for pylibmc
run: sudo apt-get install libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -e .
Expand Down Expand Up @@ -70,8 +72,10 @@ jobs:
python-version: '3.14'
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'
- name: Install libmemcached-dev for pylibmc
run: sudo apt-get install libmemcached-dev
- name: Install system packages
run: |
sudo apt update
xargs -a .github/workflows/data/apt-packages.txt sudo apt install -y --no-install-recommends
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e .
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: 'tests/requirements/py3.txt'
- name: Install gettext
run: choco install gettext --no-progress -y
- name: Install and upgrade packaging tools
run: python -m pip install --upgrade pip wheel
- run: python -m pip install -r tests/requirements/py3.txt -e .
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ answer newbie questions, and generally made Django that much better:
Hannes Struß <x@hannesstruss.de>
Hao Dong <https://github.com/RelaxedDong>
Harm Geerts <hgeerts@gmail.com>
Harvey Bellini <harveybellini@gmail.com>
Hasan Ramezani <hasan.r67@gmail.com>
Hawkeye
Helen Sherwood-Taylor <helen@rrdlabs.co.uk>
Expand Down
13 changes: 7 additions & 6 deletions django/views/templates/csrf_403.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@
html * { padding:0; margin:0; }
body * { padding:10px 20px; }
body * * { padding:0; }
body { font-family: sans-serif; background:#eee; color:#000; }
body>div { border-bottom:1px solid #ddd; }
body { font-family: sans-serif; background: light-dark(#eee, #121212); color: light-dark(#000, #e0e0e0); }
body>div { border-bottom:1px solid light-dark(#ddd, #444); }
h1 { font-weight:normal; margin-bottom:.4em; }
h1 span { font-size:60%; color:#666; font-weight:normal; }
#info { background:#f6f6f6; }
h1 span { font-size:60%; color: light-dark(#666, #aaa); font-weight:normal; }
#info { background: light-dark(#f6f6f6, #1e1e1e); }
#info ul { margin: 0.5em 4em; }
#info p, #summary p { padding-top:10px; }
#summary { background: #ffc; }
#explanation { background:#eee; border-bottom: 0px none; }
#summary { background: light-dark(#ffc, #2b2b2b); }
#explanation { background: light-dark(#eee, #1f1f1f); border-bottom: 0px none; }
code { color: light-dark(#000, #e0e0e0); }
</style>
</head>
<body>
Expand Down
19 changes: 10 additions & 9 deletions django/views/templates/technical_404.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>Page not found at {{ request.path_info }}</title>
<meta name="color-scheme" content="light" />
<meta name="color-scheme" content="light dark" />
<meta name="robots" content="NONE,NOARCHIVE">
<style>
html * { padding:0; margin:0; }
body * { padding:10px 20px; }
body * * { padding:0; }
body { font-family: sans-serif; background:#eee; color:#000; }
body > header, body > main, body > footer { border-bottom:1px solid #ddd; }
body { font-family: sans-serif; background: light-dark(#eee, #121212); color: light-dark(#000, #e0e0e0); }
body > header, body > main, body > footer { border-bottom:1px solid light-dark(#ddd, #444); }
h1 { font-weight:normal; margin-bottom:.4em; }
h1 small { font-size:60%; color:#666; font-weight:normal; }
h1 small { font-size:60%; color: light-dark(#666, #aaa); font-weight:normal; }
table { border:none; border-collapse: collapse; width:100%; }
td, th { vertical-align:top; padding:2px 3px; }
th { width:12em; text-align:right; color:#666; padding-right:.5em; }
#info { background:#f6f6f6; }
th { width:12em; text-align:right; color: light-dark(#666, #aaa); padding-right:.5em; }
#info { background: light-dark(#f6f6f6, #1e1e1e); }
#info ol { margin: 0.5em 4em; }
#info ol li { font-family: monospace; }
#summary { background: #ffc; }
#explanation { background:#eee; border-bottom: 0px none; }
pre.exception_value { font-family: sans-serif; color: #575757; font-size: 1.5em; margin: 10px 0 10px 0; }
#summary { background: light-dark(#ffc, #2b2b2b); }
#explanation { background: light-dark(#eee, #1f1f1f); border-bottom: 0px none; }
pre.exception_value { font-family: sans-serif; color: light-dark(#575757, #e0e0e0); font-size: 1.5em; margin: 10px 0 10px 0; }
code { color: light-dark(#000, #e0e0e0); }
</style>
</head>
<body>
Expand Down
62 changes: 33 additions & 29 deletions django/views/templates/technical_500.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,75 @@
<html lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="color-scheme" content="light" />
<meta name="color-scheme" content="light dark" />
<meta name="robots" content="NONE,NOARCHIVE">
<title>{% if exception_type %}{{ exception_type }}{% else %}Report{% endif %}
{% if request %} at {{ request.path_info }}{% endif %}</title>
<style>
html * { padding:0; margin:0; }
body * { padding:10px 20px; }
body * * { padding:0; }
body { font-family: sans-serif; background-color:#fff; color:#000; }
body > header, body > main, body > footer { border-bottom:1px solid #ddd; }
body { font-family: sans-serif; background-color: light-dark(#fff, #121212); color: light-dark(#000, #e0e0e0); }
body > header, body > main, body > footer { border-bottom:1px solid light-dark(#ddd, #444); }
h1 { font-weight:normal; }
h2 { margin-bottom:.8em; }
h3 { margin:1em 0 .5em 0; }
h4 { margin:0 0 .5em 0; font-weight: normal; }
code, pre { font-size: 100%; white-space: pre-wrap; word-break: break-word; }
summary { cursor: pointer; }
table { border:1px solid #ccc; border-collapse: collapse; width:100%; background:white; }
table { border:1px solid light-dark(#ccc, #444); border-collapse: collapse; width:100%; background: light-dark(white, #1e1e1e); }
tbody td, tbody th { vertical-align:top; padding:2px 3px; }
thead th {
padding:1px 6px 1px 3px; background:#fefefe; text-align:left;
font-weight:normal; font-size: 0.6875rem; border:1px solid #ddd;
padding:1px 6px 1px 3px; background: light-dark(#fefefe, #2a2a2a); text-align:left;
font-weight:normal; font-size: 0.6875rem; border:1px solid light-dark(#ddd, #444);
}
tbody th { width:12em; text-align:right; color:#666; padding-right:.5em; }
tbody th { width:12em; text-align:right; color: light-dark(#666, #aaa); padding-right:.5em; }
table.vars { margin:5px 10px 2px 40px; width: auto; }
table.vars td, table.req td { font-family:monospace; }
table td.code { width:100%; }
table td.code pre { overflow:hidden; }
table.source th { color:#666; }
table.source td { font-family:monospace; white-space:pre; border-bottom:1px solid #eee; }
ul.traceback { list-style-type:none; color: #222; }
table.source th { color: light-dark(#666, #aaa); }
table.source td { font-family:monospace; white-space:pre; border-bottom:1px solid light-dark(#eee, #444); }
ul.traceback { list-style-type:none; color: light-dark(#222, #e0e0e0); }
ul.traceback li.cause { word-break: break-word; }
ul.traceback li.frame { padding-bottom:1em; color:#4f4f4f; }
ul.traceback li.user { background-color:#e0e0e0; color:#000 }
ul.traceback li.frame { padding-bottom:1em; color: light-dark(#4f4f4f, #bbb); }
ul.traceback li.user { background-color: light-dark(#e0e0e0, #2a2a2a); color: light-dark(#000, #e0e0e0); }
div.context { padding:10px 0; overflow:hidden; }
div.context ol { padding-left:30px; margin:0 10px; list-style-position: inside; }
div.context ol li { font-family:monospace; white-space:pre; color:#777; cursor:pointer; padding-left: 2px; }
div.context ol li { font-family:monospace; white-space:pre; color: light-dark(#777, #e0e0e0); cursor:pointer; padding-left: 2px; }
div.context ol li pre { display:inline; }
div.context ol.context-line li { color:#464646; background-color:#dfdfdf; padding: 3px 2px; }
div.context ol.context-line li { color: light-dark(#464646, #fff); background-color: light-dark(#dfdfdf, #333333); padding: 3px 2px; }
div.context ol.context-line li span { position:absolute; right:32px; }
.user div.context ol.context-line li { background-color:#bbb; color:#000; }
.user div.context ol li { color:#666; }
.user div.context ol.context-line li { background-color: light-dark(#bbb, #444); color: light-dark(#000, #fff); }
.user div.context ol li { color: light-dark(#666, #bbb); }
div.commands, summary.commands { margin-left: 40px; }
div.commands a, summary.commands { color:#555; text-decoration:none; }
.user div.commands a { color: black; }
#summary { background: #ffc; }
#summary h2 { font-weight: normal; color: #666; }
div.commands a, summary.commands { color: light-dark(#555, #aaa); text-decoration:none; }
.user div.commands a { color: light-dark(black, #e0e0e0); }
#summary { background: light-dark(#ffc, #2b2b2b); }
#summary h2 { font-weight: normal; color: light-dark(#666, #aaa); }
#info { padding: 0; }
#info > * { padding:10px 20px; }
#explanation { background:#eee; }
#template, #template-not-exist { background:#f6f6f6; }
#explanation { background: light-dark(#eee, #1f1f1f); }
#template, #template-not-exist { background: light-dark(#f6f6f6, #1e1e1e); }
#template-not-exist ul { margin: 0 0 10px 20px; }
#template-not-exist .postmortem-section { margin-bottom: 3px; }
#unicode-hint { background:#eee; }
#traceback { background:#eee; }
#requestinfo { background:#f6f6f6; padding-left:120px; }
#unicode-hint { background: light-dark(#eee, #1e1e1e); }
#traceback { background: light-dark(#eee, #121212); }
#requestinfo { background: light-dark(#f6f6f6, #1e1e1e); padding-left:120px; }
#summary table { border:none; background:transparent; }
#requestinfo h2, #requestinfo h3 { position:relative; margin-left:-100px; }
#requestinfo h3 { margin-bottom:-1em; }
.error { background: #ffc; }
.specific { color:#cc3300; font-weight:bold; }
.error { background: light-dark(#ffc, #3d3d00); }
.specific { color: light-dark(#cc3300, #ff6b6b); font-weight:bold; }
h2 span.commands { font-size: 0.7rem; font-weight:normal; }
span.commands a:link {color:#5E5694;}
pre.exception_value { font-family: sans-serif; color: #575757; font-size: 1.5rem; margin: 10px 0 10px 0; }
span.commands a:link { color: light-dark(#5E5694, #a29bfe); }
pre.exception_value { font-family: sans-serif; color: light-dark(#575757, #e0e0e0); font-size: 1.5rem; margin: 10px 0 10px 0; }
.append-bottom { margin-bottom: 10px; }
.fname { user-select: all; }
code { color: light-dark(#000, #e0e0e0); }
#pastebinTraceback { background: light-dark(#fff, #1e1e1e); }
textarea { background: light-dark(#fff, #1e1e1e); color: light-dark(#000, #e0e0e0); border: 1px solid light-dark(#ccc, #444); }
input[type="submit"] { background: light-dark(#efefef, #333); color: light-dark(#000, #e0e0e0); border: 1px solid light-dark(#ccc, #555); }
</style>
{% if not is_email %}
<script>
Expand Down
Loading