Skip to content

Commit

Permalink
Merge branch 'master' into pyup-update-ruff-0.8.1-to-0.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
browniebroke authored Dec 8, 2024
2 parents 896b525 + a41bbee commit cb5a19b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
14 changes: 7 additions & 7 deletions tests/test_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/node:22-bookworm-slim
FROM docker.io/node:22.11-bookworm-slim

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"webpack-merge": "^6.0.1"
},
"engines": {
"node": "22"
"node": "22.11"
},
"browserslist": [
"last 2 versions"
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cb5a19b

Please sign in to comment.