Skip to content

Commit d31600d

Browse files
annehaleyannehaley
authored
Merge pull request #225 from OpenGeoscience/resonant-upgrade
Upgrade to Resonant 0.44
2 parents 6021df4 + 565866b commit d31600d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+9780
-797
lines changed

‎.copier-answers.resonant.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
_commit: v0.44.0
2+
_src_path: gh:kitware-resonant/cookiecutter-resonant
3+
core_app_name: core
4+
include_example_code: false
5+
project_name: GeoInsight
6+
project_slug: geoinsight
7+
python_package_name: geoinsight
8+
site_domain: api.geoinsight.kitware.com
9+
use_asgi: true

‎.gitattributes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Code needs to be run with Unix-style line endings, even when checked out on Windows
2+
* text eol=lf
3+
4+
package-lock.json linguist-generated=true
5+
uv.lock linguist-generated=true

‎.github/workflows/ci.yml‎

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,75 @@ on:
44
push:
55
branches:
66
- master
7-
7+
permissions:
8+
contents: read
89
jobs:
910
lint-client:
1011
runs-on: ubuntu-22.04
1112
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-node@v3
14-
- run: cd web && npm i && npm run lint
13+
- uses: actions/checkout@v6
14+
- uses: actions/setup-node@v6
15+
- run: |
16+
npm ci
17+
working-directory: web
18+
- run: |
19+
npm run lint
20+
working-directory: web
1521
16-
tox:
17-
runs-on: ubuntu-22.04
18-
strategy:
19-
fail-fast: false
20-
matrix:
21-
tox-env: [lint, test, check-migrations]
22+
test-server:
23+
runs-on: ubuntu-latest
2224
services:
2325
postgres:
24-
image: postgis/postgis:14-3.3
26+
image: postgis/postgis:18-3.6
2527
env:
2628
POSTGRES_DB: django
2729
POSTGRES_PASSWORD: postgres
30+
options: >-
31+
--health-cmd "pg_isready --username postgres"
32+
--health-start-period 30s
33+
--health-start-interval 2s
2834
ports:
2935
- 5432:5432
3036
rabbitmq:
31-
image: rabbitmq:management
37+
image: rabbitmq:management-alpine
38+
options: >-
39+
--health-cmd "rabbitmq-diagnostics ping"
40+
--health-start-period 30s
41+
--health-start-interval 2s
3242
ports:
3343
- 5672:5672
3444
minio:
35-
image: bitnamilegacy/minio:2025.4.22
45+
# This image does not require any command arguments (which GitHub Actions don't support)
46+
image: bitnamilegacy/minio:latest
3647
env:
3748
MINIO_ROOT_USER: minioAccessKey
3849
MINIO_ROOT_PASSWORD: minioSecretKey
50+
options: >-
51+
--health-cmd "mc ready local"
52+
--health-timeout 1s
53+
--health-start-period 30s
54+
--health-start-interval 2s
3955
ports:
4056
- 9000:9000
4157
redis:
42-
image: redis:latest
58+
image: redis:alpine
59+
options: >-
60+
--health-cmd "redis-cli ping"
61+
--health-start-period 30s
62+
--health-start-interval 2s
4363
ports:
4464
- 6379:6379
4565
steps:
46-
- uses: actions/checkout@v4
47-
- name: Set up Python
48-
uses: actions/setup-python@v5
49-
with:
50-
python-version: "3.10"
51-
- name: Install tox
52-
run: |
53-
pip install --upgrade pip
54-
pip install tox
55-
- name: Install GDAL
56-
run: |
57-
sudo apt-add-repository ppa:ubuntugis/ppa
58-
sudo apt-get update
59-
sudo apt-get install gdal-bin libgdal-dev
60-
pip install GDAL==`gdal-config --version`
66+
- name: Checkout repository
67+
uses: actions/checkout@v6
68+
- name: Install uv
69+
uses: astral-sh/setup-uv@v7
6170
- name: Run tests
6271
run: |
63-
tox -e ${{ matrix.tox-env }}
72+
uv run tox
6473
env:
6574
DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
66-
DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
67-
DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
68-
DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
69-
DJANGO_HOMEPAGE_REDIRECT_URL: http://localhost:8080/
70-
REDIS_URL: redis://localhost:6379
75+
DJANGO_CELERY_BROKER_URL: amqp://localhost:5672/
76+
DJANGO_MINIO_STORAGE_URL: http://minioAccessKey:minioSecretKey@localhost:9000/django-storage
77+
DJANGO_REDIS_URL: redis://localhost:6379
78+
DJANGO_GEOINSIGHT_WEB_URL: http://localhost:8080/

‎.github/workflows/nightly_ci.yml‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,63 @@ on:
44
schedule:
55
# Run at 1:14 am every night, to avoid high load at common schedule times.
66
- cron: "14 1 * * *"
7-
7+
permissions:
8+
contents: read
89
jobs:
9-
test:
10-
runs-on: ubuntu-22.04
10+
test-server-slow:
11+
runs-on: ubuntu-latest
1112
services:
1213
postgres:
13-
image: postgis/postgis:14-3.3
14+
image: postgis/postgis:18-3.6
1415
env:
1516
POSTGRES_DB: django
1617
POSTGRES_PASSWORD: postgres
18+
options: >-
19+
--health-cmd "pg_isready --username postgres"
20+
--health-start-period 30s
21+
--health-start-interval 2s
1722
ports:
1823
- 5432:5432
1924
rabbitmq:
20-
image: rabbitmq:management
25+
image: rabbitmq:management-alpine
26+
options: >-
27+
--health-cmd "rabbitmq-diagnostics ping"
28+
--health-start-period 30s
29+
--health-start-interval 2s
2130
ports:
2231
- 5672:5672
2332
minio:
24-
image: bitnamilegacy/minio:2025.4.22
33+
# This image does not require any command arguments (which GitHub Actions don't support)
34+
image: bitnamilegacy/minio:latest
2535
env:
2636
MINIO_ROOT_USER: minioAccessKey
2737
MINIO_ROOT_PASSWORD: minioSecretKey
38+
options: >-
39+
--health-cmd "mc ready local"
40+
--health-timeout 1s
41+
--health-start-period 30s
42+
--health-start-interval 2s
2843
ports:
2944
- 9000:9000
3045
redis:
31-
image: redis:latest
46+
image: redis:alpine
47+
options: >-
48+
--health-cmd "redis-cli ping"
49+
--health-start-period 30s
50+
--health-start-interval 2s
3251
ports:
3352
- 6379:6379
3453
steps:
35-
- uses: actions/checkout@v4
36-
- name: Set up Python
37-
uses: actions/setup-python@v5
38-
with:
39-
python-version: "3.10"
40-
- name: Install tox
41-
run: |
42-
pip install --upgrade pip
43-
pip install tox
44-
- name: Install GDAL
45-
run: |
46-
sudo apt-add-repository ppa:ubuntugis/ppa
47-
sudo apt-get update
48-
sudo apt-get install gdal-bin libgdal-dev
49-
pip install GDAL==`gdal-config --version`
54+
- name: Checkout repository
55+
uses: actions/checkout@v6
56+
- name: Install uv
57+
uses: astral-sh/setup-uv@v7
5058
- name: Run tests
5159
run: |
52-
tox -e test-slow
60+
uv run tox -e test -- -m slow
5361
env:
5462
DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
55-
DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
56-
DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
57-
DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
58-
DJANGO_HOMEPAGE_REDIRECT_URL: http://localhost:8080/
59-
REDIS_URL: redis://localhost:6379
63+
DJANGO_CELERY_BROKER_URL: amqp://localhost:5672/
64+
DJANGO_MINIO_STORAGE_URL: http://minioAccessKey:minioSecretKey@localhost:9000/django-storage
65+
DJANGO_REDIS_URL: redis://localhost:6379
66+
DJANGO_GEOINSIGHT_WEB_URL: http://localhost:8080/

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,20 @@ on:
44
push:
55
branches:
66
- master
7-
8-
env:
9-
REGISTRY: ghcr.io
10-
IMAGE_NAME: opengeoscience/geoinsight-server
11-
7+
permissions:
8+
contents: write
129
jobs:
1310
tag-and-publish:
1411
runs-on: ubuntu-latest
1512
steps:
16-
- uses: actions/checkout@v3
13+
- name: Checkout repository
14+
uses: actions/checkout@v6
1715
with:
1816
fetch-depth: 0
19-
17+
- name: Install uv
18+
uses: astral-sh/setup-uv@v7
2019
- name: Python Semantic Release
2120
id: release
2221
uses: python-semantic-release/python-semantic-release@master
2322
with:
2423
github_token: ${{ secrets.GITHUB_TOKEN }}
25-
26-
- name: Log into the Container registry
27-
uses: docker/login-action@v2
28-
with:
29-
registry: ${{ env.REGISTRY }}
30-
username: token
31-
password: ${{ secrets.GITHUB_TOKEN }}
32-
- name: Build and push the Docker image
33-
uses: docker/build-push-action@v3
34-
with:
35-
context: .
36-
file: dev/Dockerfile
37-
push: ${{ github.actor != 'dependabot[bot]' }}
38-
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.release.outputs.tag }}

0 commit comments

Comments
 (0)