Skip to content

Commit 7a3a835

Browse files
authored
Merge pull request #319 from OpenGeoscience/resonant-upgrade
2 parents 546879f + 74db748 commit 7a3a835

File tree

4 files changed

+273
-260
lines changed

4 files changed

+273
-260
lines changed

.copier-answers.resonant.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
_commit: v0.47.0
2-
_src_path: gh:kitware-resonant/cookiecutter-resonant
1+
_commit: v0.48.1
2+
_src_path: https://github.com/kitware-resonant/cookiecutter-resonant
33
core_app_name: core
44
include_example_code: false
55
project_name: GeoDatalytics
66
project_slug: geodatalytics
7-
python_package_name: geodatalytics
7+
python_package_name: uvdat
88
site_domain: api.geodatalytics.kitware.com
99
use_asgi: true

.github/renovate.json5

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
'github>kitware-resonant/.github:renovate-project.json5',
5+
],
6+
}

pyproject.toml

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,114 @@
11
[build-system]
2-
requires = ["hatchling"]
2+
requires = ["hatchling==1.29.0"]
33
build-backend = "hatchling.build"
44

55
[project]
6-
name = "uvdat"
6+
name = "geodatalytics"
77
version = "1.34.0"
88
requires-python = ">=3.12"
99
license = "Apache-2.0"
1010
license-files = ["LICENSE", "NOTICE"]
1111
classifiers = ["Private :: Do Not Upload"]
1212
dependencies = [
1313
# Runtime dependencies, always needed
14-
"celery",
15-
"channels-redis",
16-
"channels[daphne]",
17-
"django[argon2]",
18-
"django-allauth",
19-
"django-auth-style",
20-
"django-click",
21-
"django-cors-headers",
22-
"django-environ",
23-
"django-extensions",
24-
"django-filter",
25-
"django-guardian",
26-
"django-large-image",
27-
"django-oauth-toolkit",
28-
"django-resonant-settings[allauth,celery]",
29-
"django-resonant-utils[allauth,s3_storage]",
30-
"django-stubs-ext",
31-
"djangorestframework",
32-
"drf-yasg",
14+
"celery==5.6.2",
15+
"channels-redis==4.3.0",
16+
"channels[daphne]==4.3.2",
17+
"django[argon2]==5.2.9",
18+
"django-allauth==65.14.0",
19+
"django-auth-style==0.14.0",
20+
"django-click==2.5.0",
21+
"django-cors-headers==4.9.0",
22+
"django-environ==0.12.1",
23+
"django-extensions==4.1",
24+
"django-filter==25.2",
25+
"django-guardian==3.2.0",
26+
"django-large-image==0.10.2",
27+
"django-oauth-toolkit==3.2.0",
28+
"django-resonant-settings[allauth,celery]==0.48.1",
29+
"django-resonant-utils[allauth,s3_storage]==0.17.0",
30+
"django-stubs-ext==5.2.8",
31+
"djangorestframework==3.16.1",
32+
"drf-yasg==1.21.11",
3333
# Needed for GeoDjango and "large-image[gdal]"
3434
# gdal 3.10 is the newest supported by Django: https://docs.djangoproject.com/en/5.2/ref/contrib/gis/install/geolibs/
35-
'gdal==3.10.*',
36-
"geopandas",
37-
"large-image-converter",
38-
"large-image[gdal]",
39-
"matplotlib", # for raster colormaps
40-
"networkx",
41-
"numpy",
42-
"pooch[progress]",
43-
"psycopg[binary,pool]",
35+
'gdal==3.10.3',
36+
"geopandas==1.1.1",
37+
"large-image-converter==1.33.3",
38+
"large-image[gdal]==1.33.3",
39+
"matplotlib==3.9.2", # for raster colormaps
40+
"networkx==3.3",
41+
"numpy==2.4.2",
42+
"pooch[progress]==1.8.2",
43+
"psycopg[binary,pool]==3.3.2",
4444
# Needed by "large-image-converter"
45-
"pylibtiff",
46-
"pyshp",
47-
"rasterio",
48-
"rich",
49-
"webcolors",
50-
"whitenoise[brotli]",
45+
"pylibtiff==0.7.0.4.7.1",
46+
"pyshp==2.3.1",
47+
"rasterio==1.3.11",
48+
"rich==14.2.0",
49+
"webcolors==24.6.0",
50+
"whitenoise[brotli]==6.11.0",
5151
# Production-only
52-
"django-s3-file-field[s3]",
53-
"django-storages[s3]",
54-
"sentry-sdk[celery,django,pure_eval]",
55-
"uvicorn",
56-
"websockets",
52+
"django-s3-file-field[s3]==1.1.0",
53+
"django-storages[s3]==1.14.6",
54+
"sentry-sdk[celery,django,pure_eval]==2.48.0",
55+
"uvicorn==0.40.0",
56+
"websockets==15.0.1",
5757
]
5858

5959
[project.optional-dependencies]
6060
development = [
6161
# Runtime dependencies, only needed with "development" settings
62-
"daphne",
63-
"django-browser-reload",
64-
"django-debug-toolbar",
65-
"django-minio-storage",
66-
"django-resonant-utils[minio_storage]",
67-
"django-s3-file-field[minio]",
68-
"ipython",
69-
"watchdog",
70-
"werkzeug",
62+
"daphne==4.2.1",
63+
"django-browser-reload==1.21.0",
64+
"django-debug-toolbar==6.1.0",
65+
"django-minio-storage==0.5.9",
66+
"django-resonant-utils[minio_storage]==0.17.0",
67+
"django-s3-file-field[minio]==1.1.0",
68+
"ipython==9.8.0",
69+
"watchdog==6.0.0",
70+
"werkzeug==3.1.4",
7171
]
7272
tasks = [
73-
"geoai-py",
74-
"osmnx",
73+
"geoai-py==0.5.3",
74+
"osmnx==2.0.6",
7575
# Needed by "uvdat-flood-sim[large-image-writer]"
76-
"pyvips",
77-
"uvdat-flood-sim[large-image-writer]",
78-
"xdg-base-dirs",
76+
"pyvips==3.1.1.8.17.3",
77+
"uvdat-flood-sim[large-image-writer]==1.0.4",
78+
"xdg-base-dirs==6.0.2",
7979
]
8080

8181
[dependency-groups]
8282
dev = [
8383
# Additional developer tools
8484
# The "dev" dependency group is installed by default,
8585
# so use this to install "development" extras by default too
86-
"uvdat[development]",
87-
"pre-commit",
88-
"tox",
89-
"tox-uv",
86+
"geodatalytics[development]",
87+
"pre-commit==4.5.1",
88+
"tox==4.33.0",
89+
"tox-uv==1.29.0",
9090
]
9191
lint = [
92-
"ruff",
92+
"ruff==0.15.2",
9393
]
9494
type = [
95-
"mypy",
96-
"celery-types",
97-
"django-stubs[compatible-mypy]",
98-
"djangorestframework-stubs",
99-
"pandas-stubs",
100-
"types-channels",
95+
"mypy==1.19.1",
96+
"celery-types==0.24.0",
97+
"django-stubs[compatible-mypy]==5.2.8",
98+
"djangorestframework-stubs[compatible-mypy]==3.16.6",
99+
"pandas-stubs==3.0.0.260204",
100+
"types-channels==4.3.0.20250822",
101101
]
102102
test = [
103-
"django-s3-file-field-client",
104-
"factory-boy",
105-
"pytest",
106-
"pytest-django",
107-
"pytest-mock",
103+
"django-s3-file-field-client==1.1.0",
104+
"factory-boy==3.3.3",
105+
"pytest==9.0.2",
106+
"pytest-django==4.11.1",
107+
"pytest-mock==3.15.1",
108108
# Enable with "pytest --random-order ..."
109-
"pytest-random-order",
109+
"pytest-random-order==1.2.0",
110110
# Enable with "pytest --count=... ..."
111-
"pytest-repeat",
111+
"pytest-repeat==0.9.4",
112112
]
113113

114114
[[tool.uv.index]]
@@ -227,6 +227,7 @@ warn_unused_configs = true
227227
warn_unused_ignores = true
228228
plugins = [
229229
"mypy_django_plugin.main",
230+
"mypy_drf_plugin.main",
230231
]
231232

232233
[tool.django-stubs]

0 commit comments

Comments
 (0)