From 726ccbb2ded1647fa5d4e05e5ad662ea683ca8cd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:33:03 +0000 Subject: [PATCH 1/3] Update all minor versions --- custom/poetry.lock | 71 +++++++++-------- custom/pyproject.toml | 16 ++-- package-lock.json | 8 +- package.json | 2 +- ui/package-lock.json | 176 +++++++++++++++++++++--------------------- ui/package.json | 4 +- 6 files changed, 141 insertions(+), 136 deletions(-) diff --git a/custom/poetry.lock b/custom/poetry.lock index 6ca792c87..82831724f 100644 --- a/custom/poetry.lock +++ b/custom/poetry.lock @@ -2,13 +2,13 @@ [[package]] name = "alembic" -version = "1.13.3" +version = "1.14.0" description = "A database migration tool for SQLAlchemy." optional = false python-versions = ">=3.8" files = [ - {file = "alembic-1.13.3-py3-none-any.whl", hash = "sha256:908e905976d15235fae59c9ac42c4c5b75cfcefe3d27c0fbf7ae15a37715d80e"}, - {file = "alembic-1.13.3.tar.gz", hash = "sha256:203503117415561e203aa14541740643a611f641517f0209fcae63e9fa09f1a2"}, + {file = "alembic-1.14.0-py3-none-any.whl", hash = "sha256:99bd884ca390466db5e27ffccff1d179ec5c05c965cfefc0607e69f9e411cb25"}, + {file = "alembic-1.14.0.tar.gz", hash = "sha256:b00892b53b3642d0b8dbedba234dbf1924b69be83a9a769d5a624b01094e304b"}, ] [package.dependencies] @@ -80,13 +80,13 @@ typing-extensions = ">=4.0.0" [[package]] name = "azure-storage-blob" -version = "12.23.1" +version = "12.24.0" description = "Microsoft Azure Blob Storage Client Library for Python" optional = false python-versions = ">=3.8" files = [ - {file = "azure_storage_blob-12.23.1-py3-none-any.whl", hash = "sha256:1c2238aa841d1545f42714a5017c010366137a44a0605da2d45f770174bfc6b4"}, - {file = "azure_storage_blob-12.23.1.tar.gz", hash = "sha256:a587e54d4e39d2a27bd75109db164ffa2058fe194061e5446c5a89bca918272f"}, + {file = "azure_storage_blob-12.24.0-py3-none-any.whl", hash = "sha256:4f0bb4592ea79a2d986063696514c781c9e62be240f09f6397986e01755bc071"}, + {file = "azure_storage_blob-12.24.0.tar.gz", hash = "sha256:eaaaa1507c8c363d6e1d1342bd549938fdf1adec9b1ada8658c8f5bf3aea844e"}, ] [package.dependencies] @@ -1232,19 +1232,18 @@ twisted = ["twisted"] [[package]] name = "prospector" -version = "1.12.1" +version = "1.13.3" description = "Prospector is a tool to analyse Python code by aggregating the result of other tools." optional = false python-versions = "<4.0,>=3.9" files = [ - {file = "prospector-1.12.1-py3-none-any.whl", hash = "sha256:e2440b51f40626cbaea80edd97263d8c0a71a79e729415fb505096d4d39e2287"}, - {file = "prospector-1.12.1.tar.gz", hash = "sha256:b9bb4bcdd77b943c597ee4f374960e851cdd2a0b4b60eaeeaf0da465facafc60"}, + {file = "prospector-1.13.3-py3-none-any.whl", hash = "sha256:e7261c222ba54bc8aef8c9e31b2dcf5ed2a656c9b76fc0cceab294cd5ec3db6b"}, + {file = "prospector-1.13.3.tar.gz", hash = "sha256:36ccb13f69aa27c5c4682afd4cc46219b9e0c80723e30dc64ff30c71f7b877a1"}, ] [package.dependencies] bandit = {version = ">=1.5.1", optional = true, markers = "extra == \"with-bandit\" or extra == \"with_everything\""} dodgy = ">=0.2.1,<0.3.0" -flake8 = "*" GitPython = ">=3.1.27,<4.0.0" mccabe = ">=0.7.0,<0.8.0" mypy = {version = ">=0.600", optional = true, markers = "extra == \"with-mypy\" or extra == \"with_everything\""} @@ -1259,40 +1258,44 @@ pylint-django = ">=2.6.1" pylint-flask = "0.6" pyroma = {version = ">=2.4", optional = true, markers = "extra == \"with-pyroma\" or extra == \"with_everything\""} PyYAML = "*" -requirements-detector = ">=1.3.1" +requirements-detector = ">=1.3.2" setoptconf-tmp = ">=0.3.1,<0.4.0" toml = ">=0.10.2,<0.11.0" [package.extras] with-bandit = ["bandit (>=1.5.1)"] -with-everything = ["bandit (>=1.5.1)", "mypy (>=0.600)", "pyright (>=1.1.3)", "pyroma (>=2.4)", "vulture (>=1.5)"] +with-everything = ["bandit (>=1.5.1)", "mypy (>=0.600)", "pyright (>=1.1.3)", "pyroma (>=2.4)", "ruff", "vulture (>=1.5)"] with-mypy = ["mypy (>=0.600)"] with-pyright = ["pyright (>=1.1.3)"] with-pyroma = ["pyroma (>=2.4)"] +with-ruff = ["ruff"] with-vulture = ["vulture (>=1.5)"] [[package]] name = "prospector-profile-duplicated" -version = "1.6.0" +version = "1.8.0" description = "Profile that can be used to disable the duplicated or conflict rules between Prospector and other tools" optional = false python-versions = "*" files = [ - {file = "prospector_profile_duplicated-1.6.0-py2.py3-none-any.whl", hash = "sha256:bf6a6aae0c7de48043b95e4d42e23ccd090c6c7115b6ee8c8ca472ffb1a2022b"}, - {file = "prospector_profile_duplicated-1.6.0.tar.gz", hash = "sha256:9c2d541076537405e8b2484cb6222276a2df17492391b6af1b192695770aab83"}, + {file = "prospector_profile_duplicated-1.8.0-py2.py3-none-any.whl", hash = "sha256:c36ca647848739e1ca52cf220b00ba1fbdf7105217d5534a5bf2e65279ad6011"}, + {file = "prospector_profile_duplicated-1.8.0.tar.gz", hash = "sha256:1565109b016fac05c61dbce38b952bfce3ff054d0c5493d1acad1fc8e9909704"}, ] [[package]] name = "prospector-profile-utils" -version = "1.9.1" +version = "1.12.2" description = "Some utility Prospector profiles." optional = false -python-versions = "*" +python-versions = "<4.0,>=3.9" files = [ - {file = "prospector_profile_utils-1.9.1-py2.py3-none-any.whl", hash = "sha256:b458d8c4d59bdb1547e4630a2c6de4971946c4f0999443db6a9eef6d216b26b8"}, - {file = "prospector_profile_utils-1.9.1.tar.gz", hash = "sha256:008efa6797a85233fd8093dcb9d86f5fa5d89673e431c15cb1496a91c9b2c601"}, + {file = "prospector_profile_utils-1.12.2-py3-none-any.whl", hash = "sha256:74e487babdf38f2255f54e800fef200a80f67cb27014da2dc785c7c245daf965"}, + {file = "prospector_profile_utils-1.12.2.tar.gz", hash = "sha256:0d152bfc54bea059c13483d43727b9031b4c3cdfde21e4e6fa6edc5cc482c5fa"}, ] +[package.dependencies] +prospector = ">=1.13.0" + [[package]] name = "psycopg2" version = "2.9.10" @@ -1377,13 +1380,13 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyjwt" -version = "2.9.0" +version = "2.10.0" description = "JSON Web Token implementation in Python" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "PyJWT-2.9.0-py3-none-any.whl", hash = "sha256:3b02fb0f44517787776cf48f2ae25d8e14f300e6d7545a4315cee571a415e850"}, - {file = "pyjwt-2.9.0.tar.gz", hash = "sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c"}, + {file = "PyJWT-2.10.0-py3-none-any.whl", hash = "sha256:543b77207db656de204372350926bed5a86201c4cbff159f623f79c7bb487a15"}, + {file = "pyjwt-2.10.0.tar.gz", hash = "sha256:7628a7eb7938959ac1b26e819a1df0fd3259505627b575e4bad6d08f76db695c"}, ] [package.dependencies] @@ -1579,13 +1582,13 @@ testing = ["WebTest", "pytest", "pytest-cov"] [[package]] name = "pyramid-tm" -version = "2.5" +version = "2.6" description = "A package which allows Pyramid requests to join the active transaction" optional = false -python-versions = ">=3.7" +python-versions = ">=3.9" files = [ - {file = "pyramid_tm-2.5-py2.py3-none-any.whl", hash = "sha256:6638721946e809de8b4bf3f405bd2daaaa76d58442cbdf46be30ebc259f1a354"}, - {file = "pyramid_tm-2.5.tar.gz", hash = "sha256:5c81dcecd33770f5e3596687d2be35ffc4f8ce5eda00a31acb00ae35a51430d0"}, + {file = "pyramid_tm-2.6-py3-none-any.whl", hash = "sha256:665a4ee1d6f41f0c7ffa5e54d9b01d70cd3e8e5bd76277529acbdd6b6bd6fe9e"}, + {file = "pyramid_tm-2.6.tar.gz", hash = "sha256:8148d2191285280c9a0c23e6df1018b3514b4cef02115b872dd0350a4d78709c"}, ] [package.dependencies] @@ -1812,13 +1815,13 @@ files = [ [[package]] name = "sentry-sdk" -version = "2.17.0" +version = "2.19.0" description = "Python client for Sentry (https://sentry.io)" optional = false python-versions = ">=3.6" files = [ - {file = "sentry_sdk-2.17.0-py2.py3-none-any.whl", hash = "sha256:625955884b862cc58748920f9e21efdfb8e0d4f98cca4ab0d3918576d5b606ad"}, - {file = "sentry_sdk-2.17.0.tar.gz", hash = "sha256:dd0a05352b78ffeacced73a94e86f38b32e2eae15fff5f30ca5abb568a72eacf"}, + {file = "sentry_sdk-2.19.0-py2.py3-none-any.whl", hash = "sha256:7b0b3b709dee051337244a09a30dbf6e95afe0d34a1f8b430d45e0982a7c125b"}, + {file = "sentry_sdk-2.19.0.tar.gz", hash = "sha256:ee4a4d2ae8bfe3cac012dcf3e4607975904c137e1738116549fc3dbbb6ff0e36"}, ] [package.dependencies] @@ -1844,14 +1847,16 @@ grpcio = ["grpcio (>=1.21.1)", "protobuf (>=3.8.0)"] http2 = ["httpcore[http2] (==1.*)"] httpx = ["httpx (>=0.16.0)"] huey = ["huey (>=2)"] -huggingface-hub = ["huggingface-hub (>=0.22)"] +huggingface-hub = ["huggingface_hub (>=0.22)"] langchain = ["langchain (>=0.0.210)"] +launchdarkly = ["launchdarkly-server-sdk (>=9.8.0)"] litestar = ["litestar (>=2.0.0)"] loguru = ["loguru (>=0.5)"] openai = ["openai (>=1.0.0)", "tiktoken (>=0.3.0)"] +openfeature = ["openfeature-sdk (>=0.7.1)"] opentelemetry = ["opentelemetry-distro (>=0.35b0)"] opentelemetry-experimental = ["opentelemetry-distro"] -pure-eval = ["asttokens", "executing", "pure-eval"] +pure-eval = ["asttokens", "executing", "pure_eval"] pymongo = ["pymongo (>=3.1)"] pyspark = ["pyspark (>=2.4.4)"] quart = ["blinker (>=1.1)", "quart (>=0.16.1)"] @@ -2470,4 +2475,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.11,<3.13" -content-hash = "25365700fd3f9abb77eba549cfbf59091b1bce159e28d1ef77a0db6eef41ee06" +content-hash = "4da08c332d303629b21c7fc47ca4f31b21f3c92f9d87ca9f2f1eaef9c987f260" diff --git a/custom/pyproject.toml b/custom/pyproject.toml index f8ee2961e..d0034217c 100644 --- a/custom/pyproject.toml +++ b/custom/pyproject.toml @@ -12,9 +12,9 @@ pyramid = "2.0.2" pyramid-mako = "1.1.0" pyramid-debugtoolbar = "4.12.1" waitress = "3.0.2" -alembic = "1.13.3" +alembic = "1.14.0" pyramid-retry = "2.1.1" -pyramid-tm = "2.5" +pyramid-tm = "2.6" sqlalchemy = "2.0.36" transaction = "5.0" "zope.sqlalchemy" = "3.1" @@ -23,13 +23,13 @@ requests = "2.32.3" psycopg2 = "2.9.10" c2cwsgiutils = { version = "6.1.4", extras = ["webserver"] } cee-syslog-handler = "0.6.0" -PyJWT = "2.9.0" +PyJWT = "2.10.0" redis = "5.2.0" PyYAML = "6.0.2" -sentry-sdk = "2.17.0" +sentry-sdk = "2.19.0" requests-oauthlib = "2.0.0" ujson = "5.10.0" -azure-storage-blob = "12.23.1" +azure-storage-blob = "12.24.0" azure-identity = "1.19.0" papyrus = "2.6.2" geojson = "3.1.0" @@ -40,8 +40,8 @@ webob = { version = "1.8.9", optional = true } cryptography = { version = "43.0.3", optional = true } [tool.poetry.group.dev.dependencies] -prospector = { version = "1.12.1", extras = ["with_bandit", "with_mypy", "with_pyroma"] } -prospector-profile-utils = "1.9.1" -prospector-profile-duplicated = "1.6.0" +prospector = { version = "1.13.3", extras = ["with_bandit", "with_mypy", "with_pyroma"] } +prospector-profile-utils = "1.12.2" +prospector-profile-duplicated = "1.8.0" types-requests = "2.32.0.20241016" types-oauthlib = "3.2.0.20240806" diff --git a/package-lock.json b/package-lock.json index 5e1a840db..6c5038deb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "ol": "7.5.2", "rbush": "^4.0.0", "rxjs": "7.8.1", - "typescript": "5.6.3", + "typescript": "5.7.2", "vite": "5.4.11" } }, @@ -1268,9 +1268,9 @@ "license": "0BSD" }, "node_modules/typescript": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", - "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz", + "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/package.json b/package.json index 3f46872c5..8422fe939 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "ol": "7.5.2", "rbush": "^4.0.0", "rxjs": "7.8.1", - "typescript": "5.6.3", + "typescript": "5.7.2", "vite": "5.4.11" } } diff --git a/ui/package-lock.json b/ui/package-lock.json index 274c6fc6c..4065522a0 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -14,8 +14,8 @@ "devDependencies": { "@rollup/plugin-inject": "5.0.5", "@vitejs/plugin-basic-ssl": "^1.1.0", - "sass-embedded": "1.80.7", - "typescript": "5.6.3", + "sass-embedded": "1.81.0", + "typescript": "5.7.2", "vite": "5.4.11" } }, @@ -4403,9 +4403,9 @@ "license": "MIT" }, "node_modules/sass-embedded": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.80.7.tgz", - "integrity": "sha512-OwF0QvpDUjW2udPCvxgaObU0tQHycpsIgCDtHBVHuOqZ2LN0OkkY+uxSO7bOaw9wD7vXtt+1V+jiIZDTxiSRVQ==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.81.0.tgz", + "integrity": "sha512-uZQ2Faxb1oWBHpeSSzjxnhClbMb3QadN0ql0ZFNuqWOLUxwaVhrMlMhPq6TDPbbfDUjihuwrMCuy695Bgna5RA==", "dev": true, "license": "MIT", "dependencies": { @@ -4425,32 +4425,32 @@ "node": ">=16.0.0" }, "optionalDependencies": { - "sass-embedded-android-arm": "1.80.7", - "sass-embedded-android-arm64": "1.80.7", - "sass-embedded-android-ia32": "1.80.7", - "sass-embedded-android-riscv64": "1.80.7", - "sass-embedded-android-x64": "1.80.7", - "sass-embedded-darwin-arm64": "1.80.7", - "sass-embedded-darwin-x64": "1.80.7", - "sass-embedded-linux-arm": "1.80.7", - "sass-embedded-linux-arm64": "1.80.7", - "sass-embedded-linux-ia32": "1.80.7", - "sass-embedded-linux-musl-arm": "1.80.7", - "sass-embedded-linux-musl-arm64": "1.80.7", - "sass-embedded-linux-musl-ia32": "1.80.7", - "sass-embedded-linux-musl-riscv64": "1.80.7", - "sass-embedded-linux-musl-x64": "1.80.7", - "sass-embedded-linux-riscv64": "1.80.7", - "sass-embedded-linux-x64": "1.80.7", - "sass-embedded-win32-arm64": "1.80.7", - "sass-embedded-win32-ia32": "1.80.7", - "sass-embedded-win32-x64": "1.80.7" + "sass-embedded-android-arm": "1.81.0", + "sass-embedded-android-arm64": "1.81.0", + "sass-embedded-android-ia32": "1.81.0", + "sass-embedded-android-riscv64": "1.81.0", + "sass-embedded-android-x64": "1.81.0", + "sass-embedded-darwin-arm64": "1.81.0", + "sass-embedded-darwin-x64": "1.81.0", + "sass-embedded-linux-arm": "1.81.0", + "sass-embedded-linux-arm64": "1.81.0", + "sass-embedded-linux-ia32": "1.81.0", + "sass-embedded-linux-musl-arm": "1.81.0", + "sass-embedded-linux-musl-arm64": "1.81.0", + "sass-embedded-linux-musl-ia32": "1.81.0", + "sass-embedded-linux-musl-riscv64": "1.81.0", + "sass-embedded-linux-musl-x64": "1.81.0", + "sass-embedded-linux-riscv64": "1.81.0", + "sass-embedded-linux-x64": "1.81.0", + "sass-embedded-win32-arm64": "1.81.0", + "sass-embedded-win32-ia32": "1.81.0", + "sass-embedded-win32-x64": "1.81.0" } }, "node_modules/sass-embedded-android-arm": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.80.7.tgz", - "integrity": "sha512-pMxJ70yOGXYGmfoGlAMKqnr/nuP/UgKV3jc7v5kpmWGpPPMF2u63DM2QkvTqM32FyfwyxSycVaNFNT+gPomTiw==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.81.0.tgz", + "integrity": "sha512-NWEmIuaIEsGFNsIRa+5JpIpPJyZ32H15E85CNZqEIhhwWlk9UNw7vlOCmTH8MtabtnACwC/2NG8VyNa3nxKzUQ==", "cpu": [ "arm" ], @@ -4465,9 +4465,9 @@ } }, "node_modules/sass-embedded-android-arm64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.80.7.tgz", - "integrity": "sha512-Gwl/OY80uEA14MLm7efJvc1ErgGT51SvAv4/kIpTziOJpkk+999/nrEJHQ6YAJ7r5DuQcKvC3lHipcENUIpP9A==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.81.0.tgz", + "integrity": "sha512-I36P77/PKAHx6sqOmexO2iEY5kpsmQ1VxcgITZSOxPMQhdB6m4t3bTabfDuWQQmCrqqiNFtLQHeytB65bUqwiw==", "cpu": [ "arm64" ], @@ -4482,9 +4482,9 @@ } }, "node_modules/sass-embedded-android-ia32": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.80.7.tgz", - "integrity": "sha512-CJccGPgBePPYiXhyQWvgHF8AqjIDSGf+mcC4Ac/f5upRd9Z/vhQVrJfsDxt4c4tV0HGEfbQpT9xOCYF1Z6luZQ==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.81.0.tgz", + "integrity": "sha512-k8V1usXw30w1GVxvrteG1RzgYJzYQ9PfL2aeOqGdroBN7zYTD9VGJXTGcxA4IeeRxmRd7szVW2mKXXS472fh8g==", "cpu": [ "ia32" ], @@ -4499,9 +4499,9 @@ } }, "node_modules/sass-embedded-android-riscv64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.80.7.tgz", - "integrity": "sha512-kIGcyuhNes9NUDzJ9VHy/ZGKdADCCt7JAwiC7lFSc6/xs5rJtGRn6hZ+mcG7gQWAezb5oK/VMQl8ps7HBFUEXw==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.81.0.tgz", + "integrity": "sha512-RXlanyLXEpN/DEehXgLuKPsqT//GYlsGFxKXgRiCc8hIPAueFLQXKJmLWlL3BEtHgmFdbsStIu4aZCcb1hOFlQ==", "cpu": [ "riscv64" ], @@ -4516,9 +4516,9 @@ } }, "node_modules/sass-embedded-android-x64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.80.7.tgz", - "integrity": "sha512-oLMQiFpbSczOrGZSWlZvVJ1T9L6nDjS2u8PTxfT0MFX/FT3EhaxylHeiYKrmtY4epRufNCC/G96DMVqnSNa1QQ==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.81.0.tgz", + "integrity": "sha512-RQG0FxGQ1DERNyUDED8+BDVaLIjI+BNg8lVcyqlLZUrWY6NhzjwYEeiN/DNZmMmHtqDucAPNDcsdVUNQqsBy2A==", "cpu": [ "x64" ], @@ -4533,9 +4533,9 @@ } }, "node_modules/sass-embedded-darwin-arm64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.80.7.tgz", - "integrity": "sha512-Vi5BbTWd9OO0tC60CPw5IY7w3Tccr1/Gy2DdkfE4qP6Rc368WmUis5ceG8ehAye0IT7aoRXpw8XTzWyXAZHbfw==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.81.0.tgz", + "integrity": "sha512-gLKbsfII9Ppua76N41ODFnKGutla9qv0OGAas8gxe0jYBeAQFi/1iKQYdNtQtKi4mA9n5TQTqz+HHCKszZCoyA==", "cpu": [ "arm64" ], @@ -4550,9 +4550,9 @@ } }, "node_modules/sass-embedded-darwin-x64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.80.7.tgz", - "integrity": "sha512-yeANclgSHJ7K/XLG4Lnk7aQ5dk7K+oqIOtoOP0bjXgWsdPbes9V7k1ZJ9mZGl+f/XAPaRRPqjKs4WHU9s8m8MA==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.81.0.tgz", + "integrity": "sha512-7uMOlT9hD2KUJCbTN2XcfghDxt/rc50ujjfSjSHjX1SYj7mGplkINUXvVbbvvaV2wt6t9vkGkCo5qNbeBhfwBg==", "cpu": [ "x64" ], @@ -4567,9 +4567,9 @@ } }, "node_modules/sass-embedded-linux-arm": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.80.7.tgz", - "integrity": "sha512-ZttC6H2Z9YXUVFlprqZ0AgXuHdzqhvhUWsG7UUqkND9JSHvyFSwRij4h90aOK3gKg3PBGI4yG5tonLq2yV525A==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.81.0.tgz", + "integrity": "sha512-REqR9qM4RchCE3cKqzRy9Q4zigIV82SbSpCi/O4O3oK3pg2I1z7vkb3TiJsivusG/li7aqKZGmYOtAXjruGQDA==", "cpu": [ "arm" ], @@ -4584,9 +4584,9 @@ } }, "node_modules/sass-embedded-linux-arm64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.80.7.tgz", - "integrity": "sha512-Idb5K9LHHWklN7A/kqWUd6sktA36V70bSjZ/gvCDu/5CBJBkMsVNdrxcdpGzrZe7pYV4XUTkMZOwf91owEywtQ==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.81.0.tgz", + "integrity": "sha512-jy4bvhdUmqbyw1jv1f3Uxl+MF8EU/Y/GDx4w6XPJm4Ds+mwH/TwnyAwsxxoBhWfnBnW8q2ADy039DlS5p+9csQ==", "cpu": [ "arm64" ], @@ -4601,9 +4601,9 @@ } }, "node_modules/sass-embedded-linux-ia32": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.80.7.tgz", - "integrity": "sha512-xKnWWEFz1jFc9xDAG7nMcjPBCTuiJbqvTmEtwQoWj79hQrzVdkLM6SiUGVbGa1c2s2fJMS3Bg2fkDJBK6/BcuQ==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.81.0.tgz", + "integrity": "sha512-ga/Jk4q5Bn1aC+iHJteDZuLSKnmBUiS3dEg1fnl/Z7GaHIChceKDJOw0zNaILRXI0qT2E1at9MwzoRaRA5Nn/g==", "cpu": [ "ia32" ], @@ -4618,9 +4618,9 @@ } }, "node_modules/sass-embedded-linux-musl-arm": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.80.7.tgz", - "integrity": "sha512-gJLfSFiiuGaqWjaj0bcuhOlQ+t1jS9StuzXnW1b9gy2I6Y0uCprgbbELgtRVPSZlCG2BBolR76YCGQTB85M43Q==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.81.0.tgz", + "integrity": "sha512-oWVUvQ4d5Kx1Md75YXZl5z1WBjc+uOhfRRqzkJ3nWc8tjszxJN+y/5EOJavhsNI3/2yoTt6eMXRTqDD9b0tWSQ==", "cpu": [ "arm" ], @@ -4635,9 +4635,9 @@ } }, "node_modules/sass-embedded-linux-musl-arm64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.80.7.tgz", - "integrity": "sha512-7+GCYIh+c1BG4ot/PbTvVXUxd2GxDWcMxV7i3sARStQBDpTZFfohWdjUytLyqGxQgJIrbq0Q60Ucrw6HUJtJ9A==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.81.0.tgz", + "integrity": "sha512-hpntWf5kjkoxncA1Vh8vhsUOquZ8AROZKx0rQh7ZjSRs4JrYZASz1cfevPKaEM3wIim/nYa6TJqm0VqWsrERlA==", "cpu": [ "arm64" ], @@ -4652,9 +4652,9 @@ } }, "node_modules/sass-embedded-linux-musl-ia32": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.80.7.tgz", - "integrity": "sha512-Iw2E6P1lha335C5tGNgPjLD7Oll7OdLBJ7uPKaU+I7KbiOPk7ELsxUL9AYIrKO0/MLtgxGqOWWfTo/5cvU8xSA==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.81.0.tgz", + "integrity": "sha512-UEXUYkBuqTSwg5JNWiNlfMZ1Jx6SJkaEdx+fsL3Tk099L8cKSoJWH2EPz4ZJjNbyIMymrSdVfymheTeZ8u24xA==", "cpu": [ "ia32" ], @@ -4669,9 +4669,9 @@ } }, "node_modules/sass-embedded-linux-musl-riscv64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.80.7.tgz", - "integrity": "sha512-gd92dkDVpTh4xJb2hpX82E6el30h4MxCb7VJLwtbQSrQuxOlZgaDX4plMSZifsNTLvOsafdLCYyI+QsZRr8bkA==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.81.0.tgz", + "integrity": "sha512-1D7OznytbIhx2XDHWi1nuQ8d/uCVR7FGGzELgaU//T8A9DapVTUgPKvB70AF1k4GzChR9IXU/WvFZs2hDTbaJg==", "cpu": [ "riscv64" ], @@ -4686,9 +4686,9 @@ } }, "node_modules/sass-embedded-linux-musl-x64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.80.7.tgz", - "integrity": "sha512-i5udU+i0LZrL3dhHAgIfK7LBaHtScwAceiykndNIHyRXc1TY2DX3lG0EolVUvPyWFUNnvGCgxZF8oUToPzJ+pw==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.81.0.tgz", + "integrity": "sha512-ia6VCTeVDQtBSMktXRFza1AZCt8/6aUoujot6Ugf4KmdytQqPJIHxkHaGftm5xwi9WdrMGYS7zgolToPijR11A==", "cpu": [ "x64" ], @@ -4703,9 +4703,9 @@ } }, "node_modules/sass-embedded-linux-riscv64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.80.7.tgz", - "integrity": "sha512-DvnXvu019c6THNQnSWfy2eY/HFWZ2ogGUjRkdKAxj7U7i/YD+bsDIxdDQHZ48qzOguzx8n2aRa/clriM0HQPUA==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.81.0.tgz", + "integrity": "sha512-KbxSsqu4tT1XbhZfJV/5NfW0VtJIGlD58RjqJqJBi8Rnjrx29/upBsuwoDWtsPV/LhoGwwU1XkSa9Q1ifCz4fQ==", "cpu": [ "riscv64" ], @@ -4720,9 +4720,9 @@ } }, "node_modules/sass-embedded-linux-x64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.80.7.tgz", - "integrity": "sha512-nQB+IZwCzVPpPkP5L9zV416/AGPLky7L2GGPWtvxG2CEeTV1Rzet+gkhzk2eYEdbh+3py/w9YVRTaQuZ3QV0vQ==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.81.0.tgz", + "integrity": "sha512-AMDeVY2T9WAnSFkuQcsOn5c29GRs/TuqnCiblKeXfxCSKym5uKdBl/N7GnTV6OjzoxiJBbkYKdVIaS5By7Gj4g==", "cpu": [ "x64" ], @@ -4737,9 +4737,9 @@ } }, "node_modules/sass-embedded-win32-arm64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.80.7.tgz", - "integrity": "sha512-Q6Rh/CM30m8txoKK5SIVamnwPXs028Mvfq4Ol4saHgSYro9kY/HTrrWlG/RPd6sPvYBCYIm1mX8oBteDUMCajQ==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.81.0.tgz", + "integrity": "sha512-YOmBRYnygwWUmCoH14QbMRHjcvCJufeJBAp0m61tOJXIQh64ziwV4mjdqjS/Rx3zhTT4T+nulDUw4d3kLiMncA==", "cpu": [ "arm64" ], @@ -4754,9 +4754,9 @@ } }, "node_modules/sass-embedded-win32-ia32": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.80.7.tgz", - "integrity": "sha512-VZMRp81KWUZZDqNwkL3yTDT+VRxB7ScJKUJD1M8fq6P1nyJP35+r1byXLF4UQMoNgpC5B16txxMvqdkv43OqAA==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.81.0.tgz", + "integrity": "sha512-HFfr/C+uLJGGTENdnssuNTmXI/xnIasUuEHEKqI+2J0FHCWT5cpz3PGAOHymPyJcZVYGUG/7gIxIx/d7t0LFYw==", "cpu": [ "ia32" ], @@ -4771,9 +4771,9 @@ } }, "node_modules/sass-embedded-win32-x64": { - "version": "1.80.7", - "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.80.7.tgz", - "integrity": "sha512-4p+GzOJJ1KqxPKrkIkKisod4YAcC70fj4WMRLrQLLuUW+MzAvtKgX2+ZJf90D50CozSdgETGBvdPSj3VLjBzZw==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.81.0.tgz", + "integrity": "sha512-wxj52jDcIAwWcXb7ShZ7vQYKcVUkJ+04YM9l46jDY+qwHzliGuorAUyujLyKTE9heGD3gShJ3wPPC1lXzq6v9A==", "cpu": [ "x64" ], @@ -5134,9 +5134,9 @@ "license": "0BSD" }, "node_modules/typescript": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", - "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz", + "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", diff --git a/ui/package.json b/ui/package.json index 3f3f9998b..f85176e0d 100644 --- a/ui/package.json +++ b/ui/package.json @@ -16,8 +16,8 @@ "devDependencies": { "@rollup/plugin-inject": "5.0.5", "@vitejs/plugin-basic-ssl": "^1.1.0", - "sass-embedded": "1.80.7", - "typescript": "5.6.3", + "sass-embedded": "1.81.0", + "typescript": "5.7.2", "vite": "5.4.11" }, "dependencies": { From 68868876ea4dc0927f67196ead2234bdfe913d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 3 Dec 2024 14:44:21 +0100 Subject: [PATCH 2/3] Add Ruff --- custom/.bandit.yaml | 3 - custom/.prospector.yaml | 11 ++- custom/custom/__init__.py | 2 +- custom/custom/scripts/initialize_db.py | 5 +- .../query_swisscom_heatmap_api.py | 5 +- custom/poetry.lock | 79 ++++++++++++------- custom/pyproject.toml | 8 +- 7 files changed, 68 insertions(+), 45 deletions(-) delete mode 100644 custom/.bandit.yaml diff --git a/custom/.bandit.yaml b/custom/.bandit.yaml deleted file mode 100644 index 6db076a13..000000000 --- a/custom/.bandit.yaml +++ /dev/null @@ -1,3 +0,0 @@ -skips: - - B101 # Use of assert detected. - - B113 # Requests call without timeout. Done internally diff --git a/custom/.prospector.yaml b/custom/.prospector.yaml index 2e066f823..5bde363b0 100644 --- a/custom/.prospector.yaml +++ b/custom/.prospector.yaml @@ -2,12 +2,15 @@ inherits: - utils:base - utils:fix - utils:no-design-checks + - utils:c2cwsgiutils - duplicated -pylint: +ruff: disable: - - missing-timeout # Default timeout set by c2cwsgiutils + - D101 # Missing docstring in public class + - D102 # Missing docstring in public method + - D103 # Missing docstring in public function -bandit: +mypy: options: - config: .bandit.yaml + python_version: '3.10' diff --git a/custom/custom/__init__.py b/custom/custom/__init__.py index af76f4a12..a82af1da1 100644 --- a/custom/custom/__init__.py +++ b/custom/custom/__init__.py @@ -5,7 +5,7 @@ def main(global_config, **settings): - """This function returns a Pyramid WSGI application.""" + """Get the Pyramid WSGI application.""" del global_config # Unused. with Configurator(settings=settings) as config: config.include("pyramid_mako") diff --git a/custom/custom/scripts/initialize_db.py b/custom/custom/scripts/initialize_db.py index 3de37d181..59f5de510 100644 --- a/custom/custom/scripts/initialize_db.py +++ b/custom/custom/scripts/initialize_db.py @@ -8,10 +8,7 @@ def setup_models(dbsession): - """ - Add or update models / fixtures in the database. - - """ + """Add or update models / fixtures in the database.""" del dbsession # Unused diff --git a/custom/custom/views/swisscom_heatmap/query_swisscom_heatmap_api.py b/custom/custom/views/swisscom_heatmap/query_swisscom_heatmap_api.py index e166d6d8f..93ad2b1be 100644 --- a/custom/custom/views/swisscom_heatmap/query_swisscom_heatmap_api.py +++ b/custom/custom/views/swisscom_heatmap/query_swisscom_heatmap_api.py @@ -103,7 +103,7 @@ def get_dwell_demographics(self, postal_code: int, date_time: datetime) -> Featu return self.error return self.response_to_geojson_result(response.json()) - def check_api_error(self, response: Response): + def check_api_error(self, response: Response) -> None: if response.status_code != 200: err_code = response.status_code err_txt = response.text @@ -111,9 +111,10 @@ def check_api_error(self, response: Response): self.error = Response(err_txt, status=err_code) raise ExternalAPIError("External api error") - def limit_query(self): + def limit_query(self) -> None: """ Limit amount of allowed queries per day. + [bgerber] It's rude, but we are using my own key ! """ delta = datetime.now() - self.request_date diff --git a/custom/poetry.lock b/custom/poetry.lock index 82831724f..3f3fbfc07 100644 --- a/custom/poetry.lock +++ b/custom/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. [[package]] name = "alembic" @@ -30,17 +30,6 @@ files = [ {file = "astroid-3.3.5.tar.gz", hash = "sha256:5cfc40ae9f68311075d27ef68a4841bdc5cc7f6cf86671b49f00607d30188e2d"}, ] -[[package]] -name = "async-timeout" -version = "5.0.1" -description = "Timeout context manager for asyncio programs" -optional = false -python-versions = ">=3.8" -files = [ - {file = "async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c"}, - {file = "async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3"}, -] - [[package]] name = "azure-core" version = "1.32.0" @@ -767,6 +756,17 @@ files = [ [package.extras] colors = ["colorama (>=0.4.6)"] +[[package]] +name = "legacy-cgi" +version = "2.6.1" +description = "Fork of the standard library cgi and cgitb modules, being deprecated in PEP-594" +optional = false +python-versions = "<4.0,>=3.10" +files = [ + {file = "legacy_cgi-2.6.1-py3-none-any.whl", hash = "sha256:8eacc1522d9f76451337a4b5a0abf494158d39250754b0d1bc19a14c6512af9b"}, + {file = "legacy_cgi-2.6.1.tar.gz", hash = "sha256:f2ada99c747c3d72a473a6aaff6259a61f226b06fe9f3106e495ab83fd8f7a42"}, +] + [[package]] name = "mako" version = "1.3.6" @@ -1259,6 +1259,7 @@ pylint-flask = "0.6" pyroma = {version = ">=2.4", optional = true, markers = "extra == \"with-pyroma\" or extra == \"with_everything\""} PyYAML = "*" requirements-detector = ">=1.3.2" +ruff = {version = "*", optional = true, markers = "extra == \"with-ruff\" or extra == \"with_everything\""} setoptconf-tmp = ">=0.3.1,<0.4.0" toml = ">=0.10.2,<0.11.0" @@ -1273,24 +1274,24 @@ with-vulture = ["vulture (>=1.5)"] [[package]] name = "prospector-profile-duplicated" -version = "1.8.0" +version = "1.8.1" description = "Profile that can be used to disable the duplicated or conflict rules between Prospector and other tools" optional = false python-versions = "*" files = [ - {file = "prospector_profile_duplicated-1.8.0-py2.py3-none-any.whl", hash = "sha256:c36ca647848739e1ca52cf220b00ba1fbdf7105217d5534a5bf2e65279ad6011"}, - {file = "prospector_profile_duplicated-1.8.0.tar.gz", hash = "sha256:1565109b016fac05c61dbce38b952bfce3ff054d0c5493d1acad1fc8e9909704"}, + {file = "prospector_profile_duplicated-1.8.1-py2.py3-none-any.whl", hash = "sha256:a3c23517b9749ea0e61cc9b23d1526752c1eeb6c899cd0d9ec1fa77b1f373a49"}, + {file = "prospector_profile_duplicated-1.8.1.tar.gz", hash = "sha256:a08fa1f5aa77bdbc908b0c4f66b2bdb306aba10c44c5db51e389cd5cf79bda04"}, ] [[package]] name = "prospector-profile-utils" -version = "1.12.2" +version = "1.14.0" description = "Some utility Prospector profiles." optional = false python-versions = "<4.0,>=3.9" files = [ - {file = "prospector_profile_utils-1.12.2-py3-none-any.whl", hash = "sha256:74e487babdf38f2255f54e800fef200a80f67cb27014da2dc785c7c245daf965"}, - {file = "prospector_profile_utils-1.12.2.tar.gz", hash = "sha256:0d152bfc54bea059c13483d43727b9031b4c3cdfde21e4e6fa6edc5cc482c5fa"}, + {file = "prospector_profile_utils-1.14.0-py3-none-any.whl", hash = "sha256:15853e984314f90d688052c7dc09c9206779fdfb7f0606f6a4a617d167c6e693"}, + {file = "prospector_profile_utils-1.14.0.tar.gz", hash = "sha256:258bbe70c7411c7c11a7a7fc202c9a021db3d775a3bf45e7e8bd9f96206bcc48"}, ] [package.dependencies] @@ -1412,10 +1413,7 @@ files = [ [package.dependencies] astroid = ">=3.3.5,<=3.4.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} -dill = [ - {version = ">=0.3.7", markers = "python_version >= \"3.12\""}, - {version = ">=0.3.6", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, -] +dill = {version = ">=0.3.7", markers = "python_version >= \"3.12\""} isort = ">=4.2.5,<5.13.0 || >5.13.0,<6" mccabe = ">=0.6,<0.8" platformdirs = ">=2.2.0" @@ -1722,9 +1720,6 @@ files = [ {file = "redis-5.2.0.tar.gz", hash = "sha256:0b1087665a771b1ff2e003aa5bdd354f15a70c9e25d5a7dbf9c722c16528a7b0"}, ] -[package.dependencies] -async-timeout = {version = ">=4.0.3", markers = "python_full_version < \"3.11.3\""} - [package.extras] hiredis = ["hiredis (>=3.0.0)"] ocsp = ["cryptography (>=36.0.1)", "pyopenssl (==23.2.1)", "requests (>=2.31.0)"] @@ -1802,6 +1797,33 @@ pygments = ">=2.13.0,<3.0.0" [package.extras] jupyter = ["ipywidgets (>=7.5.1,<9)"] +[[package]] +name = "ruff" +version = "0.8.1" +description = "An extremely fast Python linter and code formatter, written in Rust." +optional = false +python-versions = ">=3.7" +files = [ + {file = "ruff-0.8.1-py3-none-linux_armv6l.whl", hash = "sha256:fae0805bd514066f20309f6742f6ee7904a773eb9e6c17c45d6b1600ca65c9b5"}, + {file = "ruff-0.8.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b8a4f7385c2285c30f34b200ca5511fcc865f17578383db154e098150ce0a087"}, + {file = "ruff-0.8.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:cd054486da0c53e41e0086e1730eb77d1f698154f910e0cd9e0d64274979a209"}, + {file = "ruff-0.8.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2029b8c22da147c50ae577e621a5bfbc5d1fed75d86af53643d7a7aee1d23871"}, + {file = "ruff-0.8.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:2666520828dee7dfc7e47ee4ea0d928f40de72056d929a7c5292d95071d881d1"}, + {file = "ruff-0.8.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:333c57013ef8c97a53892aa56042831c372e0bb1785ab7026187b7abd0135ad5"}, + {file = "ruff-0.8.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:288326162804f34088ac007139488dcb43de590a5ccfec3166396530b58fb89d"}, + {file = "ruff-0.8.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b12c39b9448632284561cbf4191aa1b005882acbc81900ffa9f9f471c8ff7e26"}, + {file = "ruff-0.8.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:364e6674450cbac8e998f7b30639040c99d81dfb5bbc6dfad69bc7a8f916b3d1"}, + {file = "ruff-0.8.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b22346f845fec132aa39cd29acb94451d030c10874408dbf776af3aaeb53284c"}, + {file = "ruff-0.8.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:b2f2f7a7e7648a2bfe6ead4e0a16745db956da0e3a231ad443d2a66a105c04fa"}, + {file = "ruff-0.8.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:adf314fc458374c25c5c4a4a9270c3e8a6a807b1bec018cfa2813d6546215540"}, + {file = "ruff-0.8.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:a885d68342a231b5ba4d30b8c6e1b1ee3a65cf37e3d29b3c74069cdf1ee1e3c9"}, + {file = "ruff-0.8.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:d2c16e3508c8cc73e96aa5127d0df8913d2290098f776416a4b157657bee44c5"}, + {file = "ruff-0.8.1-py3-none-win32.whl", hash = "sha256:93335cd7c0eaedb44882d75a7acb7df4b77cd7cd0d2255c93b28791716e81790"}, + {file = "ruff-0.8.1-py3-none-win_amd64.whl", hash = "sha256:2954cdbe8dfd8ab359d4a30cd971b589d335a44d444b6ca2cb3d1da21b75e4b6"}, + {file = "ruff-0.8.1-py3-none-win_arm64.whl", hash = "sha256:55873cc1a473e5ac129d15eccb3c008c096b94809d693fc7053f588b67822737"}, + {file = "ruff-0.8.1.tar.gz", hash = "sha256:3583db9a6450364ed5ca3f3b4225958b24f78178908d5c4bc0f46251ccca898f"}, +] + [[package]] name = "semver" version = "3.0.2" @@ -2375,6 +2397,9 @@ files = [ {file = "webob-1.8.9.tar.gz", hash = "sha256:ad6078e2edb6766d1334ec3dee072ac6a7f95b1e32ce10def8ff7f0f02d56589"}, ] +[package.dependencies] +legacy-cgi = {version = ">=2.6", markers = "python_version >= \"3.13\""} + [package.extras] docs = ["Sphinx (>=1.7.5)", "pylons-sphinx-themes"] testing = ["coverage", "pytest (>=3.1.0)", "pytest-cov", "pytest-xdist"] @@ -2474,5 +2499,5 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" -python-versions = ">=3.11,<3.13" -content-hash = "4da08c332d303629b21c7fc47ca4f31b21f3c92f9d87ca9f2f1eaef9c987f260" +python-versions = ">=3.12,<3.14" +content-hash = "d23589d3fabe2866f8c01de292b7a55c470a5d67a3cd52241eb360bbe2d080aa" diff --git a/custom/pyproject.toml b/custom/pyproject.toml index d0034217c..862170a4e 100644 --- a/custom/pyproject.toml +++ b/custom/pyproject.toml @@ -5,7 +5,7 @@ description = 'Not used' authors = [] [tool.poetry.dependencies] -python = ">=3.11,<3.13" +python = ">=3.12,<3.14" gunicorn = "23.0.0" plaster-pastedeploy = "1.0.1" pyramid = "2.0.2" @@ -40,8 +40,8 @@ webob = { version = "1.8.9", optional = true } cryptography = { version = "43.0.3", optional = true } [tool.poetry.group.dev.dependencies] -prospector = { version = "1.13.3", extras = ["with_bandit", "with_mypy", "with_pyroma"] } -prospector-profile-utils = "1.12.2" -prospector-profile-duplicated = "1.8.0" +prospector = { version = "1.13.3", extras = ["with_bandit", "with_mypy", "with_pyroma", "with_ruff"] } +prospector-profile-utils = "1.14.0" +prospector-profile-duplicated = "1.8.1" types-requests = "2.32.0.20241016" types-oauthlib = "3.2.0.20240806" From 34d070d12e474f749f1174f95d53af748e99afb2 Mon Sep 17 00:00:00 2001 From: "geo-ghci-int[bot]" <146321879+geo-ghci-int[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:53:53 +0000 Subject: [PATCH 3/3] Update from base branch From the artifact of the previous workflow run --- tilegeneration/config.yaml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tilegeneration/config.yaml.tmpl b/tilegeneration/config.yaml.tmpl index e068b78d9..76bd80065 100644 --- a/tilegeneration/config.yaml.tmpl +++ b/tilegeneration/config.yaml.tmpl @@ -44,7 +44,7 @@ defaults: # the URL of the WMS server to used url: ${MAPSERVER_URL} params: - ogcserver: Main PNG + ogcserver: MapServer # Set the headers to get the right virtual host, and don't get any cached result headers: Host: '${VISIBLE_WEB_HOST}'