Merge branch 'master' into pyup-update-django-5.0.9-to-5.0.10

This commit is contained in:
Bruno Alla 2024-12-08 15:32:18 +01:00 committed by GitHub
commit da24b3aa3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 11 deletions

View File

@ -109,6 +109,6 @@ jobs:
run: uv sync
- uses: actions/setup-node@v4
with:
node-version: "22"
node-version: "22.11"
- name: Bare Metal ${{ matrix.script.name }}
run: sh tests/test_bare.sh ${{ matrix.script.args }}

View File

@ -18,19 +18,19 @@ cd my_awesome_project
docker compose -f docker-compose.local.yml build
# run the project's type checks
docker compose -f docker-compose.local.yml run django mypy my_awesome_project
docker compose -f docker-compose.local.yml run --rm django mypy my_awesome_project
# run the project's tests
docker compose -f docker-compose.local.yml run django pytest
docker compose -f docker-compose.local.yml run --rm django pytest
# return non-zero status code if there are migrations that have not been created
docker compose -f docker-compose.local.yml run django python manage.py makemigrations --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; }
docker compose -f docker-compose.local.yml run --rm django python manage.py makemigrations --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; }
# Test support for translations
docker compose -f docker-compose.local.yml run django python manage.py makemessages --all
docker compose -f docker-compose.local.yml run --rm django python manage.py makemessages --all
# Make sure the check doesn't raise any warnings
docker compose -f docker-compose.local.yml run \
docker compose -f docker-compose.local.yml run --rm \
-e DJANGO_SECRET_KEY="$(openssl rand -base64 64)" \
-e REDIS_URL=redis://redis:6379/0 \
-e DJANGO_AWS_ACCESS_KEY_ID=x \
@ -42,10 +42,10 @@ docker compose -f docker-compose.local.yml run \
django python manage.py check --settings=config.settings.production --deploy --database default --fail-level WARNING
# Generate the HTML for the documentation
docker compose -f docker-compose.docs.yml run docs make html
docker compose -f docker-compose.docs.yml run --rm docs make html
# Run npm build script if package.json is present
if [ -f "package.json" ]
then
docker compose -f docker-compose.local.yml run node npm run build
docker compose -f docker-compose.local.yml run --rm node npm run build
fi

View File

@ -1,4 +1,4 @@
FROM docker.io/node:22-bookworm-slim
FROM docker.io/node:22.11-bookworm-slim
WORKDIR /app

View File

@ -35,7 +35,7 @@
"webpack-merge": "^6.0.1"
},
"engines": {
"node": "22"
"node": "22.11"
},
"browserslist": [
"last 2 versions"

View File

@ -44,7 +44,7 @@ django-redis==5.4.0 # https://github.com/jazzband/django-redis
djangorestframework==3.15.2 # https://github.com/encode/django-rest-framework
django-cors-headers==4.6.0 # https://github.com/adamchainz/django-cors-headers
# DRF-spectacular for api documentation
drf-spectacular==0.27.2 # https://github.com/tfranzel/drf-spectacular
drf-spectacular==0.28.0 # https://github.com/tfranzel/drf-spectacular
{%- endif %}
{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
django-webpack-loader==3.1.1 # https://github.com/django-webpack/django-webpack-loader