Skip to content

Commit b326239

Browse files
committed
Upgrade to Resonant v0.50.5
1 parent 4077f00 commit b326239

11 files changed

Lines changed: 32 additions & 14 deletions

File tree

.copier-answers.resonant.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_commit: v0.50.2
1+
_commit: v0.50.5
22
_src_path: https://github.com/kitware-resonant/cookiecutter-resonant
33
core_app_name: core
44
include_example_code: false

.devcontainer/devcontainer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@
1212
// The "vscode" user and remoteUser are set by the base image label (devcontainers/base).
1313
"workspaceFolder": "/home/vscode/geodatalytics",
1414
"features": {
15-
"ghcr.io/devcontainers/features/node:1": {},
15+
"ghcr.io/devcontainers/features/git-lfs:1": {},
16+
"ghcr.io/devcontainers/features/node:1": {
17+
"version": "24",
18+
// Work around https://github.com/devcontainers/features/pull/1625
19+
"pnpmVersion": "none"
20+
},
1621
"ghcr.io/rails/devcontainer/features/postgres-client:1": {
1722
"version": 18
1823
},
@@ -49,6 +54,8 @@
4954
"containers.containerClient": "com.microsoft.visualstudio.containers.docker",
5055
// Container-specific Python paths
5156
"python.defaultInterpreterPath": "/home/vscode/venv/bin/python",
57+
// Disable automatic Python venv activation in new terminals.
58+
"python-envs.terminal.autoActivationType": "off",
5259
// Ensure that `envFile` from any user settings is ignored; Docker Compose provides it.
5360
"python.envFile": "",
5461
// Reduce file watcher overhead for generated/cache directories.

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ indent_size = 2
2727
indent_size = 4
2828
max_line_length = 100
2929

30+
[*.sh]
31+
indent_size = 2
32+
3033
[*.toml]
3134
indent_size = 2
3235

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Install npm
1515
uses: actions/setup-node@v6
1616
with:
17-
node-version: 24.14.0
17+
node-version: 24
1818
- run: |
1919
npm ci
2020
working-directory: web
@@ -37,7 +37,7 @@ jobs:
3737
ports:
3838
- 5432:5432
3939
rabbitmq:
40-
image: rabbitmq:management-alpine
40+
image: rabbitmq:4.2-management-alpine
4141
options: >-
4242
--health-cmd "rabbitmq-diagnostics ping"
4343
--health-start-period 30s
@@ -69,10 +69,10 @@ jobs:
6969
- name: Checkout repository
7070
uses: actions/checkout@v6
7171
- name: Install uv
72-
uses: astral-sh/setup-uv@v7
72+
uses: astral-sh/setup-uv@v8.1.0
7373
- name: Run tests
7474
run: |
75-
uv run tox
75+
uv run --locked tox
7676
env:
7777
DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
7878
DJANGO_CELERY_BROKER_URL: amqp://localhost:5672/

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Install npm
2020
uses: actions/setup-node@v6
2121
with:
22-
node-version: 24.14.0
22+
node-version: 24
2323
- name: Run Semantic Release
2424
run: |
2525
uvx python-semantic-release version

dev/django.Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /usr/local/bin/
55
# Ensure Python output appears immediately in container logs.
66
ENV PYTHONUNBUFFERED=1
77

8+
# Override Node's default of attempting to bind to IPv6 interfaces over IPv4
9+
ENV NODE_OPTIONS=--dns-result-order=ipv4first
10+
811
# Put the uv and npm caches in a separate location,
912
# where they can persist and be shared across containers.
1013
# The uv cache and virtual environment are on different volumes, so hardlinks won't work.

docker-compose.override.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ services:
100100
condition: service_healthy
101101

102102
web:
103-
image: node:24.14.0
103+
image: node:24
104104
command: ["sh", "-c", "npm install && npm run serve -- --host 0.0.0.0"]
105105
working_dir: /web
106106
volumes:

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
- postgres:/var/lib/postgresql
1616

1717
rabbitmq:
18-
image: rabbitmq:management-alpine
18+
image: rabbitmq:4.2-management-alpine
1919
healthcheck:
2020
test: ["CMD", "rabbitmq-diagnostics", "ping"]
2121
start_period: 30s

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies = [
2525
"django-guardian==3.3.0",
2626
"django-large-image==0.10.3",
2727
"django-oauth-toolkit==3.2.0",
28-
"django-resonant-settings[allauth,celery]==0.50.2",
28+
"django-resonant-settings[allauth,celery]==0.50.5",
2929
"django-resonant-utils[allauth,s3_storage]==0.19.0",
3030
"django-stubs-ext==6.0.1",
3131
"djangorestframework==3.17.0",

uv.lock

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)