From 1bbde9d26ec82b62667f25d2f31490cebf468e5a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:44:19 +0000 Subject: [PATCH] Update all minor versions --- docker/qgisserver/poetry.lock | 30 ++++------- docker/qgisserver/pyproject.toml | 2 +- geoportal/package-lock.json | 88 ++++++++++++++++---------------- geoportal/package.json | 4 +- poetry.lock | 25 +++++---- pyproject.toml | 4 +- 6 files changed, 70 insertions(+), 83 deletions(-) diff --git a/docker/qgisserver/poetry.lock b/docker/qgisserver/poetry.lock index 7a1dad071b..75b9839989 100644 --- a/docker/qgisserver/poetry.lock +++ b/docker/qgisserver/poetry.lock @@ -864,21 +864,20 @@ files = [ [[package]] name = "papyrus" -version = "2.5" +version = "2.6.2" description = "Geospatial Extensions for Pyramid" optional = false -python-versions = "*" +python-versions = ">=3.9" files = [ - {file = "papyrus-2.5-py2.py3-none-any.whl", hash = "sha256:2a604a63582834f2ca1f49458ea9019772c83ab9464e57afdc3ed9a169fbeac4"}, - {file = "papyrus-2.5.tar.gz", hash = "sha256:a4e3d5e4c91cb2205a5726b5e7c75d46c4ee3e9ae43c213d175f7db4de198967"}, + {file = "papyrus-2.6.2-py3-none-any.whl", hash = "sha256:e56a0c50ee2fa75de8a0ba71ddfb583adf0a517fbea706c2f2f7ddfc8e364430"}, + {file = "papyrus-2.6.2.tar.gz", hash = "sha256:565d19e30dedcd0b0e7fbee3ba0f9cb5627a6adc135545141dfd2f383776544a"}, ] [package.dependencies] -GeoAlchemy2 = ">=0.2.4" -geojson = ">=1.1.0" -pyramid = ">=1.1a3" -Shapely = ">=1.2" -six = "*" +geoalchemy2 = ">=0.0.0,<1.0.0" +geojson = ">=3.0.0,<4.0.0" +pyramid = ">=2.0.0,<3.0.0" +shapely = ">=2.0.0,<3.0.0" [[package]] name = "pastedeploy" @@ -1665,17 +1664,6 @@ numpy = ">=1.14,<3" docs = ["matplotlib", "numpydoc (==1.1.*)", "sphinx", "sphinx-book-theme", "sphinx-remove-toctrees"] test = ["pytest", "pytest-cov"] -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] - [[package]] name = "smmap" version = "5.0.1" @@ -2210,4 +2198,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.13" -content-hash = "d729969eaeab609558ca82e5c177aef565ca16f8fbc4b9f42f8066b9f8bc1b0e" +content-hash = "b3d3873d02d846acd45f36d54523a449740d614c2488280b6209b92abab2bc5d" diff --git a/docker/qgisserver/pyproject.toml b/docker/qgisserver/pyproject.toml index 9895a36257..487e862557 100644 --- a/docker/qgisserver/pyproject.toml +++ b/docker/qgisserver/pyproject.toml @@ -25,7 +25,7 @@ authors = [] [tool.poetry.dependencies] python = ">=3.10,<3.13" c2cwsgiutils = { extras = ["broadcast"], version = "6.0.8" } -papyrus = "2.5" # commons +papyrus = "2.6.2" # commons transaction = "4.0" # commons "c2c.template" = "2.4.2" GeoAlchemy2 = "0.15.2" diff --git a/geoportal/package-lock.json b/geoportal/package-lock.json index f586f0176d..e3a99ba792 100644 --- a/geoportal/package-lock.json +++ b/geoportal/package-lock.json @@ -9,8 +9,8 @@ "version": "1.0.0", "dependencies": { "@snyk/protect": "1.1293.0", - "@typescript-eslint/eslint-plugin": "8.4.0", - "@typescript-eslint/parser": "8.4.0", + "@typescript-eslint/eslint-plugin": "8.5.0", + "@typescript-eslint/parser": "8.5.0", "angular-gettext-tools": "2.5.3", "commander": "12.1.0", "eslint": "8.57.0", @@ -750,16 +750,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz", - "integrity": "sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.5.0.tgz", + "integrity": "sha512-lHS5hvz33iUFQKuPFGheAB84LwcJ60G8vKnEhnfcK1l8kGVLro2SFYW6K0/tj8FUhRJ0VHyg1oAfg50QGbPPHw==", "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.4.0", - "@typescript-eslint/type-utils": "8.4.0", - "@typescript-eslint/utils": "8.4.0", - "@typescript-eslint/visitor-keys": "8.4.0", + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/type-utils": "8.5.0", + "@typescript-eslint/utils": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -783,15 +783,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.4.0.tgz", - "integrity": "sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.5.0.tgz", + "integrity": "sha512-gF77eNv0Xz2UJg/NbpWJ0kqAm35UMsvZf1GHj8D9MRFTj/V3tAciIWXfmPLsAAF/vUlpWPvUDyH1jjsr0cMVWw==", "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "8.4.0", - "@typescript-eslint/types": "8.4.0", - "@typescript-eslint/typescript-estree": "8.4.0", - "@typescript-eslint/visitor-keys": "8.4.0", + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/typescript-estree": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "debug": "^4.3.4" }, "engines": { @@ -811,13 +811,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.4.0.tgz", - "integrity": "sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz", + "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==", "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.4.0", - "@typescript-eslint/visitor-keys": "8.4.0" + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -828,13 +828,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.4.0.tgz", - "integrity": "sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.5.0.tgz", + "integrity": "sha512-N1K8Ix+lUM+cIDhL2uekVn/ZD7TZW+9/rwz8DclQpcQ9rk4sIL5CAlBC0CugWKREmDjBzI/kQqU4wkg46jWLYA==", "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.4.0", - "@typescript-eslint/utils": "8.4.0", + "@typescript-eslint/typescript-estree": "8.5.0", + "@typescript-eslint/utils": "8.5.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -852,9 +852,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.4.0.tgz", - "integrity": "sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz", + "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==", "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -865,13 +865,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.4.0.tgz", - "integrity": "sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz", + "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==", "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "8.4.0", - "@typescript-eslint/visitor-keys": "8.4.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -905,15 +905,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.4.0.tgz", - "integrity": "sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz", + "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==", "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.4.0", - "@typescript-eslint/types": "8.4.0", - "@typescript-eslint/typescript-estree": "8.4.0" + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/typescript-estree": "8.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -927,12 +927,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.4.0.tgz", - "integrity": "sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz", + "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==", "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.4.0", + "@typescript-eslint/types": "8.5.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { diff --git a/geoportal/package.json b/geoportal/package.json index 1848068521..fc1ffc44f0 100644 --- a/geoportal/package.json +++ b/geoportal/package.json @@ -9,8 +9,8 @@ }, "dependencies": { "@snyk/protect": "1.1293.0", - "@typescript-eslint/eslint-plugin": "8.4.0", - "@typescript-eslint/parser": "8.4.0", + "@typescript-eslint/eslint-plugin": "8.5.0", + "@typescript-eslint/parser": "8.5.0", "angular-gettext-tools": "2.5.3", "commander": "12.1.0", "eslint": "8.57.0", diff --git a/poetry.lock b/poetry.lock index 633fc453ac..a370a4ad71 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2252,21 +2252,20 @@ files = [ [[package]] name = "papyrus" -version = "2.5" +version = "2.6.2" description = "Geospatial Extensions for Pyramid" optional = false -python-versions = "*" +python-versions = ">=3.9" files = [ - {file = "papyrus-2.5-py2.py3-none-any.whl", hash = "sha256:2a604a63582834f2ca1f49458ea9019772c83ab9464e57afdc3ed9a169fbeac4"}, - {file = "papyrus-2.5.tar.gz", hash = "sha256:a4e3d5e4c91cb2205a5726b5e7c75d46c4ee3e9ae43c213d175f7db4de198967"}, + {file = "papyrus-2.6.2-py3-none-any.whl", hash = "sha256:e56a0c50ee2fa75de8a0ba71ddfb583adf0a517fbea706c2f2f7ddfc8e364430"}, + {file = "papyrus-2.6.2.tar.gz", hash = "sha256:565d19e30dedcd0b0e7fbee3ba0f9cb5627a6adc135545141dfd2f383776544a"}, ] [package.dependencies] -GeoAlchemy2 = ">=0.2.4" -geojson = ">=1.1.0" -pyramid = ">=1.1a3" -Shapely = ">=1.2" -six = "*" +geoalchemy2 = ">=0.0.0,<1.0.0" +geojson = ">=3.0.0,<4.0.0" +pyramid = ">=2.0.0,<3.0.0" +shapely = ">=2.0.0,<3.0.0" [[package]] name = "passwordgenerator" @@ -4544,13 +4543,13 @@ urllib3 = ">=2" [[package]] name = "types-setuptools" -version = "74.0.0.20240831" +version = "74.1.0.20240907" description = "Typing stubs for setuptools" optional = false python-versions = ">=3.8" files = [ - {file = "types-setuptools-74.0.0.20240831.tar.gz", hash = "sha256:8b4a544cc91d42a019dc1e41fd397608b4bc7e20c7d7d5bc326589ffd9e8f8a1"}, - {file = "types_setuptools-74.0.0.20240831-py3-none-any.whl", hash = "sha256:4d9d18ea9214828d695a384633130009f5dee2681a157ee873d3680b62931590"}, + {file = "types-setuptools-74.1.0.20240907.tar.gz", hash = "sha256:0abdb082552ca966c1e5fc244e4853adc62971f6cd724fb1d8a3713b580e5a65"}, + {file = "types_setuptools-74.1.0.20240907-py3-none-any.whl", hash = "sha256:15b38c8e63ca34f42f6063ff4b1dd662ea20086166d5ad6a102e670a52574120"}, ] [[package]] @@ -4960,4 +4959,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.13" -content-hash = "e0990f81b14fd69f71c124d4023aac61ad8523eb3bcdf1bca3b8523e8248adee" +content-hash = "ed4d19e80090178cd7dbcb881bff2b10a5e64f8b8d508388965f3b35cc394693" diff --git a/pyproject.toml b/pyproject.toml index 49def84eb9..34c6cf488b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ getitfixed = "1.0.29" # geoportal isodate = "0.6.1" # geoportal Mako = "1.3.5" # geoportal OWSLib = "0.31.0" # geoportal -papyrus = "2.5" # commons, geoportal +papyrus = "2.6.2" # commons, geoportal passwordgenerator = "1.5.1" # geoportal psycopg2 = "2.9.9" # geoportal pycryptodome = "3.20.0" # geoportal @@ -92,7 +92,7 @@ types-pytz = "2024.1.0.20240417" types-pyyaml = "6.0.12.20240808" types-python-dateutil = "2.9.0.20240821" types-requests = "2.32.0.20240905" -types-setuptools = "74.0.0.20240831" +types-setuptools = "74.1.0.20240907" mappyfile = "1.0.2" # To be able to upgrade project from version <= 2.8 c2cciutils = { version = "1.5.8", extras = ["checks"] }