Upgrade to Resonant 0.43

Author: brianhelba

.copier-answers.resonant.yml

@@ -0,0 +1,8 @@
+_commit: v0.43.2
+_src_path: gh:kitware-resonant/cookiecutter-resonant
+core_app_name: core
+include_example_code: false
+project_name: GeoInsight
+project_slug: geoinsight
+python_package_name: geoinsight
+site_domain: api.geoinsight.kitware.com

.gitattributes

@@ -0,0 +1,2 @@
+package-lock.json linguist-generated=true
+uv.lock linguist-generated=true

.github/workflows/ci.yml

@@ -4,67 +4,75 @@ on:
   push:
     branches:
       - master
-
+permissions:
+  contents: read
 jobs:
   lint-client:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-      - run: cd web && npm i && npm run lint
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
+      - run: |
+          npm ci
+        working-directory: web
+      - run: |
+          npm run lint
+        working-directory: web
 
-  tox:
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        tox-env: [lint, test, check-migrations]
+  test-server:
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgis/postgis:14-3.3
+        image: postgis/postgis:18-3.6
         env:
           POSTGRES_DB: django
           POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd "pg_isready --username postgres"
+          --health-start-period 30s
+          --health-start-interval 2s
         ports:
           - 5432:5432
       rabbitmq:
-        image: rabbitmq:management
+        image: rabbitmq:management-alpine
+        options: >-
+          --health-cmd "rabbitmq-diagnostics ping"
+          --health-start-period 30s
+          --health-start-interval 2s
         ports:
           - 5672:5672
       minio:
-        image: bitnamilegacy/minio:2025.4.22
+        # This image does not require any command arguments (which GitHub Actions don't support)
+        image: bitnamilegacy/minio:latest
         env:
           MINIO_ROOT_USER: minioAccessKey
           MINIO_ROOT_PASSWORD: minioSecretKey
+        options: >-
+          --health-cmd "mc ready local"
+          --health-timeout 1s
+          --health-start-period 30s
+          --health-start-interval 2s
         ports:
           - 9000:9000
       redis:
-        image: redis:latest
+        image: redis:alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-start-period 30s
+          --health-start-interval 2s
         ports:
           - 6379:6379
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-      - name: Install tox
-        run: |
-          pip install --upgrade pip
-          pip install tox
-      - name: Install GDAL
-        run: |
-          sudo apt-add-repository ppa:ubuntugis/ppa
-          sudo apt-get update
-          sudo apt-get install gdal-bin libgdal-dev
-          pip install GDAL==`gdal-config --version`
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
       - name: Run tests
         run: |
-          tox -e ${{ matrix.tox-env }}
+          uv run tox
         env:
           DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
-          DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
-          DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
-          DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
-          DJANGO_HOMEPAGE_REDIRECT_URL: http://localhost:8080/
-          REDIS_URL: redis://localhost:6379
+          DJANGO_CELERY_BROKER_URL: amqp://localhost:5672/
+          DJANGO_MINIO_STORAGE_URL: http://minioAccessKey:minioSecretKey@localhost:9000/django-storage
+          DJANGO_REDIS_URL: redis://localhost:6379
+          DJANGO_GEOINSIGHT_WEB_URL: http://localhost:8080/

.github/workflows/nightly_ci.yml

@@ -4,56 +4,70 @@ on:
   schedule:
     # Run at 1:14 am every night, to avoid high load at common schedule times.
     - cron: "14 1 * * *"
-
+permissions:
+  contents: read
 jobs:
-  test:
+  lint-client:
     runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+      - run: cd web && npm i && npm run lint
+
+  test-server:
+    runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgis/postgis:14-3.3
+        image: postgis/postgis:18-3.6
         env:
           POSTGRES_DB: django
           POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd "pg_isready --username postgres"
+          --health-start-period 30s
+          --health-start-interval 2s
         ports:
           - 5432:5432
       rabbitmq:
-        image: rabbitmq:management
+        image: rabbitmq:management-alpine
+        options: >-
+          --health-cmd "rabbitmq-diagnostics ping"
+          --health-start-period 30s
+          --health-start-interval 2s
         ports:
           - 5672:5672
       minio:
+        # This image does not require any command arguments (which GitHub Actions don't support)
         image: bitnamilegacy/minio:2025.4.22
         env:
           MINIO_ROOT_USER: minioAccessKey
           MINIO_ROOT_PASSWORD: minioSecretKey
+        options: >-
+          --health-cmd "mc ready local"
+          --health-timeout 1s
+          --health-start-period 30s
+          --health-start-interval 2s
         ports:
           - 9000:9000
       redis:
-        image: redis:latest
+        image: redis:alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-start-period 30s
+          --health-start-interval 2s
         ports:
           - 6379:6379
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-      - name: Install tox
-        run: |
-          pip install --upgrade pip
-          pip install tox
-      - name: Install GDAL
-        run: |
-          sudo apt-add-repository ppa:ubuntugis/ppa
-          sudo apt-get update
-          sudo apt-get install gdal-bin libgdal-dev
-          pip install GDAL==`gdal-config --version`
+      - name: Checkout repository
+        uses: actions/checkout@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
       - name: Run tests
         run: |
-          tox -e test-slow
+          uv run tox -e test -- -m slow
         env:
           DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
-          DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
-          DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
-          DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
-          DJANGO_HOMEPAGE_REDIRECT_URL: http://localhost:8080/
-          REDIS_URL: redis://localhost:6379
+          DJANGO_CELERY_BROKER_URL: amqp://localhost:5672/
+          DJANGO_MINIO_STORAGE_URL: http://minioAccessKey:minioSecretKey@localhost:9000/django-storage-testing
+          DJANGO_REDIS_URL: redis://localhost:6379
+          DJANGO_GEOINSIGHT_WEB_URL: http://localhost:8080/