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 .copier-answers.resonant.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_commit: v0.41.0
_commit: v0.43.0
_src_path: gh:kitware-resonant/cookiecutter-resonant
core_app_name: core
include_example_code: false
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ jobs:
- 5672:5672
minio:
# This image does not require any command arguments (which GitHub Actions don't support)
# see: https://github.com/bitnami/containers/issues/83267
image: bitnamilegacy/minio:2025.4.22
image: bitnamilegacy/minio:latest
env:
MINIO_ROOT_USER: minioAccessKey
MINIO_ROOT_PASSWORD: minioSecretKey
Expand All @@ -70,7 +69,7 @@ jobs:
- 6379:6379
steps:
- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
lfs: true
- name: Install uv
Expand All @@ -82,7 +81,7 @@ jobs:
DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
DJANGO_ISIC_ELASTICSEARCH_URL: http://elastic:elastic@localhost:9200
DJANGO_CELERY_BROKER_URL: amqp://localhost:5672/
DJANGO_MINIO_STORAGE_URL: http://minioAccessKey:minioSecretKey@localhost:9000/django-storage-testing
DJANGO_MINIO_STORAGE_URL: http://minioAccessKey:minioSecretKey@localhost:9000/django-storage
DJANGO_CACHE_URL: redis://localhost:6379/0
build-node:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ release: python ./manage.py migrate --check || python ./manage.py migrate
# set the request line limit to match heroku:
# https://devcenter.heroku.com/articles/http-routing#http-validation-and-restrictions
# long request lines are useful for long DSL search queries
web: gunicorn --timeout 120 --limit-request-line 8192 --bind 0.0.0.0:$PORT isic.wsgi
web: gunicorn --graceful-timeout 120 --timeout 125 --limit-request-line 8192 --bind 0.0.0.0:$PORT isic.wsgi
worker: REMAP_SIGTERM=SIGQUIT ./deploy/worker.sh
low_priority_worker: REMAP_SIGTERM=SIGQUIT ./deploy/low-priority-worker.sh
beat: REMAP_SIGTERM=SIGQUIT celery --app isic.celery beat --loglevel INFO
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
postgres:
image: pgvector/pgvector:pg17
image: pgvector/pgvector:pg18
shm_size: 128mb
environment:
POSTGRES_DB: django
Expand All @@ -11,7 +11,7 @@ services:
ports:
- 5432:5432
volumes:
- postgres:/var/lib/postgresql/data
- postgres:/var/lib/postgresql

elasticsearch:
image: elasticsearch:9.0.2
Expand Down
4 changes: 2 additions & 2 deletions isic/core/migrations/0001_default_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.db.migrations.state import StateApps


def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor) -> None:
Site = apps.get_model("sites", "Site")

# A default site object may or may not exist.
Expand All @@ -21,7 +21,7 @@ def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor
)


def rollback_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
def rollback_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor) -> None:
Site = apps.get_model("sites", "Site")

# This is the initial value of the default site object, as populated by the sites app.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"django-oauth-toolkit<2.0.0",
"django-redis",
"django-resonant-settings[allauth,celery]",
"django-resonant-utils[s3_storage]",
"django-resonant-utils[allauth,s3_storage]",
"django-stubs-ext",
"django-widget-tweaks",
"gdal",
Expand Down
13 changes: 8 additions & 5 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.