diff --git a/data/Dockerfile b/data/Dockerfile index 253dcc4ec..151805820 100644 --- a/data/Dockerfile +++ b/data/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-bullseye as build-stage +FROM python:3.12-bullseye as build-stage WORKDIR /app ARG GIT_COMMIT_SHA diff --git a/data/requirements.txt b/data/requirements.txt index e80a6e7cd..23a5d82bf 100644 --- a/data/requirements.txt +++ b/data/requirements.txt @@ -3,7 +3,7 @@ defusedxml~=0.7.1 lxml~=4.9.2 numba~=0.58.0 Pillow~=10.1.0 -pydantic~=2.4.2 +pydantic~=2.5.1 pyyaml~=6.0 requests~=2.31.0 ruamel.yaml~=0.18.5 diff --git a/docker-compose.yml b/docker-compose.yml index 3d0c2381d..f64f4a746 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,7 +94,7 @@ services: interval: 10s start_period: 30s meilisearch: - image: getmeili/meilisearch:v1.4.1 + image: getmeili/meilisearch:v1.4.2 restart: always healthcheck: test: wget -q --spider http://localhost:7700/health diff --git a/webclient/package.json b/webclient/package.json index d5c48e60e..8d1200d69 100644 --- a/webclient/package.json +++ b/webclient/package.json @@ -15,11 +15,11 @@ "format": "prettier --write ." }, "dependencies": { - "@vueuse/core": "10.6.0", - "maplibre-gl": "3.6.0", + "@vueuse/core": "10.6.1", + "maplibre-gl": "3.6.1", "pinia": "2.1.7", "spectre.css": "github:Valexr/spectre#dfe3bc2c59d23cd4bfd43c690aae3655576ff708", - "swagger-ui-dist": "5.9.3", + "swagger-ui-dist": "5.10.0", "swaggerdark": "github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3", "vue": "3.3.8", "vue-router": "4.2.5" @@ -33,7 +33,7 @@ "@vue/eslint-config-typescript": "12.0.0", "@vue/tsconfig": "0.4.0", "@yankeeinlondon/link-builder": "1.2.1", - "cypress": "13.5.0", + "cypress": "13.5.1", "eslint": "8.53.0", "eslint-plugin-vue": "9.18.1", "isomorphic-fetch": "3.0.0", diff --git a/webclient/pnpm-lock.yaml b/webclient/pnpm-lock.yaml index f88eaa31d..f9d156d29 100644 --- a/webclient/pnpm-lock.yaml +++ b/webclient/pnpm-lock.yaml @@ -6,11 +6,11 @@ settings: dependencies: '@vueuse/core': - specifier: 10.6.0 - version: 10.6.0(vue@3.3.8) + specifier: 10.6.1 + version: 10.6.1(vue@3.3.8) maplibre-gl: - specifier: 3.6.0 - version: 3.6.0 + specifier: 3.6.1 + version: 3.6.1 pinia: specifier: 2.1.7 version: 2.1.7(typescript@5.2.2)(vue@3.3.8) @@ -18,8 +18,8 @@ dependencies: specifier: github:Valexr/spectre#dfe3bc2c59d23cd4bfd43c690aae3655576ff708 version: github.com/Valexr/spectre/dfe3bc2c59d23cd4bfd43c690aae3655576ff708 swagger-ui-dist: - specifier: 5.9.3 - version: 5.9.3 + specifier: 5.10.0 + version: 5.10.0 swaggerdark: specifier: github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3 version: github.com/octycs/SwaggerDark/f02d394c8ff698cdd93e09c2188b058d2d686ca3 @@ -56,8 +56,8 @@ devDependencies: specifier: 1.2.1 version: 1.2.1(@vitejs/plugin-vue@4.4.1)(sass@1.69.5)(vite@4.5.0) cypress: - specifier: 13.5.0 - version: 13.5.0 + specifier: 13.5.1 + version: 13.5.1 eslint: specifier: 8.53.0 version: 8.53.0 @@ -692,8 +692,8 @@ packages: resolution: {integrity: sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==} dev: true - /@types/geojson@7946.0.12: - resolution: {integrity: sha512-uK2z1ZHJyC0nQRbuovXFt4mzXDwf27vQeUWNhfKGwRcWW429GOhP8HxUHlM6TLH4bzmlv/HlEjpvJh3JfmGsAA==} + /@types/geojson@7946.0.13: + resolution: {integrity: sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==} dev: false /@types/json-schema@7.0.14: @@ -704,15 +704,15 @@ packages: resolution: {integrity: sha512-hPpIeeHb/2UuCw06kSNAOVWgehBLXEo0/fUs0mw3W2qhqX89PI2yvok83MnuctYGCPrabGIoi0fFso4DQ+sNUQ==} dev: true - /@types/mapbox__point-geometry@0.1.3: - resolution: {integrity: sha512-2W46IOXlu7vC8m3+M5rDqSnuY22GFxxx3xhkoyqyPWrD+eP2iAwNst0A1+umLYjCTJMJTSpiofphn9h9k+Kw+w==} + /@types/mapbox__point-geometry@0.1.4: + resolution: {integrity: sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==} dev: false /@types/mapbox__vector-tile@1.3.3: resolution: {integrity: sha512-d263B3KCQtXKVZMHpMJrEW5EeLBsQ8jvAS9nhpUKC5hHIlQaACG9PWkW8qxEeNuceo9120AwPjeS91uNa4ltqA==} dependencies: - '@types/geojson': 7946.0.12 - '@types/mapbox__point-geometry': 0.1.3 + '@types/geojson': 7946.0.13 + '@types/mapbox__point-geometry': 0.1.4 '@types/pbf': 3.0.4 dev: false @@ -763,10 +763,10 @@ packages: resolution: {integrity: sha512-tAe4Q+OLFOA/AMD+0lq8ovp8t3ysxAOeaScnfNdZpUxaGl51ZMDEITxkvFl1STudQ58mz6gzVGl9VhMKhwRnZQ==} dev: true - /@types/supercluster@7.1.2: - resolution: {integrity: sha512-qMhofL945Z4njQUuntadexAgPtpiBC014WvVqU70Prj42LC77Xgmz04us7hSMmwjs7KbgAwGBmje+FSOvDbP0Q==} + /@types/supercluster@7.1.3: + resolution: {integrity: sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==} dependencies: - '@types/geojson': 7946.0.12 + '@types/geojson': 7946.0.13 dev: false /@types/swagger-ui-dist@3.30.4: @@ -1136,24 +1136,24 @@ packages: resolution: {integrity: sha512-CPuIReonid9+zOG/CGTT05FXrPYATEqoDGNrEaqS4hwcw5BUNM2FguC0mOwJD4Jr16UpRVl9N0pY3P+srIbqmg==} dev: true - /@vueuse/core@10.6.0(vue@3.3.8): - resolution: {integrity: sha512-+Yee+g9+9BEbvkyGdn4Bf4yZx9EfocAytpV2ZlrlP7xcz+qznLmZIDqDroTvc5vtMkWZicisgEv8dt3+jL+HQg==} + /@vueuse/core@10.6.1(vue@3.3.8): + resolution: {integrity: sha512-Pc26IJbqgC9VG1u6VY/xrXXfxD33hnvxBnKrLlA2LJlyHII+BSrRoTPJgGYq7qZOu61itITFUnm6QbacwZ4H8Q==} dependencies: '@types/web-bluetooth': 0.0.20 - '@vueuse/metadata': 10.6.0 - '@vueuse/shared': 10.6.0(vue@3.3.8) + '@vueuse/metadata': 10.6.1 + '@vueuse/shared': 10.6.1(vue@3.3.8) vue-demi: 0.14.6(vue@3.3.8) transitivePeerDependencies: - '@vue/composition-api' - vue dev: false - /@vueuse/metadata@10.6.0: - resolution: {integrity: sha512-mzKHkHoiK6xVz01VzQjM2l6ofUanEaofgEGPgDHcAzlvOTccPRTIdEuzneOUTYxgfm1vkDikS6rtrEw/NYlaTQ==} + /@vueuse/metadata@10.6.1: + resolution: {integrity: sha512-qhdwPI65Bgcj23e5lpGfQsxcy0bMjCAsUGoXkJ7DsoeDUdasbZ2DBa4dinFCOER3lF4gwUv+UD2AlA11zdzMFw==} dev: false - /@vueuse/shared@10.6.0(vue@3.3.8): - resolution: {integrity: sha512-0t4MVE18sO+/4Gh0jfeOXBTjKeV4606N9kIrDOLPjFl8Rwnlodn+QC5A4LfJuysK7aOsTMjF3KnzNeueaI0xlQ==} + /@vueuse/shared@10.6.1(vue@3.3.8): + resolution: {integrity: sha512-TECVDTIedFlL0NUfHWncf3zF9Gc4VfdxfQc8JFwoVZQmxpONhLxFrlm0eHQeidHj4rdTPL3KXJa0TZCk1wnc5Q==} dependencies: vue-demi: 0.14.6(vue@3.3.8) transitivePeerDependencies: @@ -1858,8 +1858,8 @@ packages: /csstype@3.1.2: resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} - /cypress@13.5.0: - resolution: {integrity: sha512-oh6U7h9w8wwHfzNDJQ6wVcAeXu31DlIYlNOBvfd6U4CcB8oe4akawQmH+QJVOMZlM42eBoCne015+svVqdwdRQ==} + /cypress@13.5.1: + resolution: {integrity: sha512-yqLViT0D/lPI8Kkm7ciF/x/DCK/H/DnogdGyiTnQgX4OVR2aM30PtK+kvklTOD1u3TuItiD9wUQAF8EYWtyZug==} engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0} hasBin: true requiresBuild: true @@ -3451,8 +3451,8 @@ packages: engines: {node: '>=8'} dev: true - /maplibre-gl@3.6.0: - resolution: {integrity: sha512-l+jBu+bMy96FOV4em7FgjMH77ewlOtLPXLAem/Q44y4+0vTGsJvPksJSoLoedmikcSff2QN20VZFo3+Zg0UJPQ==} + /maplibre-gl@3.6.1: + resolution: {integrity: sha512-XQpLkNTD6WYJXqF7vTxgHbAyShoZMm5o8fohXCn9PC/S/g3zBk92m7GUsN6KfuECh2rO01uiYbSNCSURkOODyQ==} engines: {node: '>=16.14.0', npm: '>=8.1.0'} dependencies: '@mapbox/geojson-rewind': 0.5.2 @@ -3463,11 +3463,11 @@ packages: '@mapbox/vector-tile': 1.3.1 '@mapbox/whoots-js': 3.1.0 '@maplibre/maplibre-gl-style-spec': 19.3.3 - '@types/geojson': 7946.0.12 - '@types/mapbox__point-geometry': 0.1.3 + '@types/geojson': 7946.0.13 + '@types/mapbox__point-geometry': 0.1.4 '@types/mapbox__vector-tile': 1.3.3 '@types/pbf': 3.0.4 - '@types/supercluster': 7.1.2 + '@types/supercluster': 7.1.3 earcut: 2.2.4 geojson-vt: 3.2.1 gl-matrix: 3.4.3 @@ -4667,8 +4667,8 @@ packages: resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==} dev: true - /swagger-ui-dist@5.9.3: - resolution: {integrity: sha512-/OgHfO96RWXF+p/EOjEnvKNEh94qAG/VHukgmVKh5e6foX9kas1WbjvQnDDj0sSTAMr9MHRBqAWytDcQi0VOrg==} + /swagger-ui-dist@5.10.0: + resolution: {integrity: sha512-PBTn5qDOQVtU29hrx74km86SnK3/mFtF3grI98y575y1aRpxiuStRTIvsfXFudPFkLofHU7H9a+fKrP+Oayc3g==} dev: false /synckit@0.8.5: