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
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install Requirements
run: pip install -r requirements.txt
- name: Cache Django
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: Django/*
key: Django
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Post/update PR comment
env:
PR_NUMBER: ${{ steps.pr.outputs.number }}
uses: actions/github-script@v8
uses: actions/github-script@v9
with:
script: |
const fs = require('fs');
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
timeout-minutes: 60
steps:
- name: "Check title and manage labels"
uses: actions/github-script@v8
uses: actions/github-script@v9
with:
script: |
const title = context.payload.pull_request.title;
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
python-version: '3.14'
- run: python -m pip install flake8
- name: flake8
# Pinned to v3.0.0.
uses: liskin/gh-problem-matcher-wrap@e7b7beaaafa52524748b31a381160759d68d61fb
# Pinned to v4.0.0.
uses: liskin/gh-problem-matcher-wrap@d31bb388d13cf879e93f878cb2550299f0afb460
with:
linters: flake8
run: flake8
Expand All @@ -53,8 +53,8 @@ jobs:
python-version: '3.14'
- run: python -m pip install isort
- name: isort
# Pinned to v3.0.0.
uses: liskin/gh-problem-matcher-wrap@e7b7beaaafa52524748b31a381160759d68d61fb
# Pinned to v4.0.0.
uses: liskin/gh-problem-matcher-wrap@d31bb388d13cf879e93f878cb2550299f0afb460
with:
linters: isort
run: isort --check --diff django tests scripts
Expand Down Expand Up @@ -93,9 +93,9 @@ jobs:
with:
persist-credentials: false
- name: Set up Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v6
with:
node-version: '20'
node-version: '24'
cache: 'npm'
cache-dependency-path: '**/package.json'
- run: npm install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/schedule_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ jobs:
with:
persist-credentials: false
- name: Set up Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v6
with:
node-version: '20'
node-version: '24'
cache: 'npm'
cache-dependency-path: '**/package.json'
- run: npm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
branch:
- main
steps:
- uses: actions/github-script@v8
- uses: actions/github-script@v9
with:
github-token: ${{secrets.SCHEDULE_WORKFLOW_TOKEN}}
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/screenshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: python -Wall runtests.py --verbosity=2 --noinput --selenium=chrome --headless --screenshots --settings=test_sqlite --parallel=1

- name: Cache oxipng
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ~/.cargo/
key: ${{ runner.os }}-cargo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ jobs:
with:
persist-credentials: false
- name: Set up Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v6
with:
node-version: '20'
node-version: '24'
cache: 'npm'
cache-dependency-path: '**/package.json'
- run: npm install
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 26.1.0
rev: 26.5.1
hooks:
- id: black
exclude: \.py-tpl$
Expand All @@ -9,23 +9,23 @@ repos:
hooks:
- id: blacken-docs
additional_dependencies:
- black==26.1.0
- black==26.5.1
files: 'docs/.*\.txt$'
args: ["--rst-literal-block"]
- repo: https://github.com/PyCQA/isort
rev: 7.0.0
rev: 8.0.1
hooks:
- id: isort
- repo: https://github.com/PyCQA/flake8
rev: 7.3.0
hooks:
- id: flake8
- repo: https://github.com/biomejs/pre-commit
rev: v2.4.12
rev: v2.4.15
hooks:
- id: biome-check
additional_dependencies: ["@biomejs/biome@2.4.12"]
additional_dependencies: ["@biomejs/biome@2.4.15"]
- repo: https://github.com/zizmorcore/zizmor-pre-commit
rev: v1.19.0
rev: v1.25.2
hooks:
- id: zizmor
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/2.4.12/schema.json",
"$schema": "https://biomejs.dev/schemas/2.4.15/schema.json",
"files": {
"includes": [
"django/contrib/admin/static/admin/css/**/*.css",
Expand Down
12 changes: 6 additions & 6 deletions django/contrib/admin/static/admin/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ a:focus {
}

a:not(
[role="button"],
#header a,
#nav-sidebar a,
#content-main.app-list a,
.object-tools a
) {
[role="button"],
#header a,
#nav-sidebar a,
#content-main.app-list a,
.object-tools a
) {
text-decoration: underline;
}

Expand Down
2 changes: 1 addition & 1 deletion docs/internals/contributing/writing-code/coding-style.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Imports

.. console::

$ python -m pip install "isort >= 7.0.0"
$ python -m pip install "isort >= 8.0.1"
$ isort .

This runs ``isort`` recursively from your current directory, modifying any
Expand Down
6 changes: 3 additions & 3 deletions docs/internals/contributing/writing-code/unit-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ default environments can be seen as follows:
py3
black
blacken-docs
flake8>=3.7.0
flake8
docs
isort>=7.0.0
isort
lint-docs
zizmor>=1.19.0
zizmor

Testing other Python versions and database backends
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"npm": ">=1.3.0"
},
"devDependencies": {
"@biomejs/biome": "2.4.12",
"puppeteer": "^24.22.0",
"grunt": "^1.6.1",
"@biomejs/biome": "2.4.15",
"puppeteer": "^25.0.4",
"grunt": "^1.6.2",
"grunt-cli": "^1.5.0",
"grunt-contrib-qunit": "^10.1.1",
"qunit": "^2.24.1"
"grunt-contrib-qunit": "^10.2.0",
"qunit": "^2.25.0"
}
}
2 changes: 1 addition & 1 deletion tests/requirements/py3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ aiosmtpd >= 1.4.5
asgiref >= 3.9.1
argon2-cffi >= 23.1.0
bcrypt >= 4.1.1
black >= 26.1.0
black >= 26.5.1
docutils >= 0.22
geoip2 >= 4.8.0
jinja2 >= 2.11.0
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ commands =
[testenv:flake8]
basepython = python3
usedevelop = false
deps = flake8 >= 3.7.0
deps = flake8 >= 7.3.0
changedir = {toxinidir}
commands = flake8 .

Expand All @@ -86,7 +86,7 @@ commands =
[testenv:isort]
basepython = python3
usedevelop = false
deps = isort >= 7.0.0
deps = isort >= 8.0.1
changedir = {toxinidir}
commands = isort --check-only --diff django tests scripts

Expand All @@ -113,7 +113,7 @@ commands =
[testenv:zizmor]
basepython = python3
usedevelop = false
deps = zizmor >= 1.19.0
deps = zizmor >= 1.25.2
changedir = {toxinidir}
commands =
zizmor .
Loading