From c00fe8a32b25ddeb4d72f16526d9a92c3e766b07 Mon Sep 17 00:00:00 2001 From: ammar92 Date: Wed, 25 Dec 2024 14:48:35 +0100 Subject: [PATCH] Fix `docs` target in Makefile (#3987) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jan Klopper --- Makefile | 7 +++++-- boefjes/poetry.lock | 10 +++++----- boefjes/pyproject.toml | 2 +- boefjes/requirements-dev.txt | 6 +++--- boefjes/requirements.txt | 6 +++--- mula/poetry.lock | 10 +++++----- mula/pyproject.toml | 2 +- mula/requirements-dev.txt | 6 +++--- mula/requirements.txt | 6 +++--- poetry.lock | 11 ++++++----- pyproject.toml | 2 +- requirements.txt | 7 ++++--- 12 files changed, 40 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 0b88bd45209..7f1a242af93 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,8 @@ debian12-build-image: ubuntu22.04-build-image: docker build -t kat-ubuntu22.04-build-image packaging/ubuntu22.04 +CHECKSUM_CMD = $(if $(filter $(UNAME), Darwin), shasum -a 256, sha256sum --quiet) + docs: $(call build-settings-doc,keiko,keiko.settings,keiko,Keiko) $(call build-settings-doc,octopoes,octopoes.config.settings,octopoes,Octopoes) @@ -118,8 +120,9 @@ docs: curl -sL -o - https://registry.npmjs.org/d3/-/d3-7.9.0.tgz | tar -Oxzf - package/dist/d3.min.js > docs/source/_static/d3.min.js curl -sL -o - https://registry.npmjs.org/mermaid/-/mermaid-11.3.0.tgz | tar -Oxzf - package/dist/mermaid.min.js > docs/source/_static/mermaid.min.js - echo "f2094bbf6141b359722c4fe454eb6c4b0f0e42cc10cc7af921fc158fceb86539 docs/source/_static/d3.min.js" | sha256sum --quiet --check || exit 1 - echo "0d2b6f2361e7e0ce466a6ed458e03daa5584b42ef6926c3beb62eb64670ca261 docs/source/_static/mermaid.min.js" | sha256sum --quiet --check || exit 1 + + echo "f2094bbf6141b359722c4fe454eb6c4b0f0e42cc10cc7af921fc158fceb86539 docs/source/_static/d3.min.js" | $(CHECKSUM_CMD) --check || exit 1 + echo "0d2b6f2361e7e0ce466a6ed458e03daa5584b42ef6926c3beb62eb64670ca261 docs/source/_static/mermaid.min.js" | $(CHECKSUM_CMD) --check || exit 1 PYTHONPATH=$(PYTHONPATH):boefjes/:bytes/:keiko/:mula/:octopoes/ sphinx-build -b html --fail-on-warning docs/source docs/_build diff --git a/boefjes/poetry.lock b/boefjes/poetry.lock index b6da660e713..17f47b670a1 100644 --- a/boefjes/poetry.lock +++ b/boefjes/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "aiohappyeyeballs" @@ -627,13 +627,13 @@ toml = ["tomli"] [[package]] name = "croniter" -version = "5.0.1" +version = "6.0.0" description = "croniter provides iteration for datetime object with cron like format" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.6" files = [ - {file = "croniter-5.0.1-py2.py3-none-any.whl", hash = "sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9"}, - {file = "croniter-5.0.1.tar.gz", hash = "sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e"}, + {file = "croniter-6.0.0-py2.py3-none-any.whl", hash = "sha256:2f878c3856f17896979b2a4379ba1f09c83e374931ea15cc835c5dd2eee9b368"}, + {file = "croniter-6.0.0.tar.gz", hash = "sha256:37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577"}, ] [package.dependencies] @@ -3451,4 +3451,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "802637ac2f8706fac47614919001e436ae760a07bff899ceb36eb20d35c2f098" +content-hash = "db6da356254fede97fdce03800f189a5a9a4f05ee60359933d239847886067dc" diff --git a/boefjes/pyproject.toml b/boefjes/pyproject.toml index 07dea6da492..a46aed416c8 100644 --- a/boefjes/pyproject.toml +++ b/boefjes/pyproject.toml @@ -74,7 +74,7 @@ fastapi-slim = "^0.115.2" structlog = "^24.2.0" # required by kat_maxmind_geoip maxminddb = "^2.6.2" -croniter = "^5.0.1" +croniter = "^6.0.0" [tool.poetry.group.dev.dependencies] pytest = "^8.2.0" diff --git a/boefjes/requirements-dev.txt b/boefjes/requirements-dev.txt index 3b8541255c6..2c11f29179c 100644 --- a/boefjes/requirements-dev.txt +++ b/boefjes/requirements-dev.txt @@ -361,9 +361,9 @@ coverage[toml]==7.6.1 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959 \ --hash=sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234 \ --hash=sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc -croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \ - --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \ - --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9 +croniter==6.0.0 ; python_version >= "3.10" and python_version < "4.0" \ + --hash=sha256:2f878c3856f17896979b2a4379ba1f09c83e374931ea15cc835c5dd2eee9b368 \ + --hash=sha256:37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577 cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494 \ --hash=sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806 \ diff --git a/boefjes/requirements.txt b/boefjes/requirements.txt index 7855252290d..46b15d8cecf 100644 --- a/boefjes/requirements.txt +++ b/boefjes/requirements.txt @@ -288,9 +288,9 @@ colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" \ configparser==7.0.0 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:af3c618a67aaaedc4d689fd7317d238f566b9aa03cae50102e92d7f0dfe78ba0 \ --hash=sha256:f46d52a12811c637104c6bb8eb33693be0038ab6bf01d69aae009c39ec8c2017 -croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \ - --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \ - --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9 +croniter==6.0.0 ; python_version >= "3.10" and python_version < "4.0" \ + --hash=sha256:2f878c3856f17896979b2a4379ba1f09c83e374931ea15cc835c5dd2eee9b368 \ + --hash=sha256:37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577 cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494 \ --hash=sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806 \ diff --git a/mula/poetry.lock b/mula/poetry.lock index dc6f75d52f3..1a68c98b075 100644 --- a/mula/poetry.lock +++ b/mula/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "alembic" @@ -194,13 +194,13 @@ toml = ["tomli"] [[package]] name = "croniter" -version = "5.0.1" +version = "6.0.0" description = "croniter provides iteration for datetime object with cron like format" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.6" files = [ - {file = "croniter-5.0.1-py2.py3-none-any.whl", hash = "sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9"}, - {file = "croniter-5.0.1.tar.gz", hash = "sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e"}, + {file = "croniter-6.0.0-py2.py3-none-any.whl", hash = "sha256:2f878c3856f17896979b2a4379ba1f09c83e374931ea15cc835c5dd2eee9b368"}, + {file = "croniter-6.0.0.tar.gz", hash = "sha256:37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577"}, ] [package.dependencies] @@ -1602,4 +1602,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "578fdf1a924878fd49595f750306be73c3a43a064c235d2f6d8ffe223eb50ba5" +content-hash = "81da75154107fd503bd294bc680ca0fd51454dc2b58f3f88a0eab4d75f69b203" diff --git a/mula/pyproject.toml b/mula/pyproject.toml index 49445d77681..d73c21059be 100644 --- a/mula/pyproject.toml +++ b/mula/pyproject.toml @@ -8,7 +8,7 @@ license = "EUPL" [tool.poetry.dependencies] python = "^3.10" alembic = "^1.12.1" -croniter = "^5.0.1" +croniter = "^6.0.0" mmh3 = "^4.0.1" pika = "^1.3.2" prometheus-client = "^0.19.0" diff --git a/mula/requirements-dev.txt b/mula/requirements-dev.txt index 6b1146428b9..88051dfa978 100644 --- a/mula/requirements-dev.txt +++ b/mula/requirements-dev.txt @@ -92,9 +92,9 @@ coverage[toml]==7.6.1 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959 \ --hash=sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234 \ --hash=sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc -croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \ - --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \ - --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9 +croniter==6.0.0 ; python_version >= "3.10" and python_version < "4.0" \ + --hash=sha256:2f878c3856f17896979b2a4379ba1f09c83e374931ea15cc835c5dd2eee9b368 \ + --hash=sha256:37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577 decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \ --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186 diff --git a/mula/requirements.txt b/mula/requirements.txt index ea7b526e937..7a31d5adcfc 100644 --- a/mula/requirements.txt +++ b/mula/requirements.txt @@ -19,9 +19,9 @@ click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" \ colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows" \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 -croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \ - --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \ - --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9 +croniter==6.0.0 ; python_version >= "3.10" and python_version < "4.0" \ + --hash=sha256:2f878c3856f17896979b2a4379ba1f09c83e374931ea15cc835c5dd2eee9b368 \ + --hash=sha256:37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577 decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \ --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186 diff --git a/poetry.lock b/poetry.lock index 4044f575f64..0ddde83668b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "alabaster" @@ -215,13 +215,13 @@ files = [ [[package]] name = "croniter" -version = "5.0.1" +version = "6.0.0" description = "croniter provides iteration for datetime object with cron like format" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.6" files = [ - {file = "croniter-5.0.1-py2.py3-none-any.whl", hash = "sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9"}, - {file = "croniter-5.0.1.tar.gz", hash = "sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e"}, + {file = "croniter-6.0.0-py2.py3-none-any.whl", hash = "sha256:2f878c3856f17896979b2a4379ba1f09c83e374931ea15cc835c5dd2eee9b368"}, + {file = "croniter-6.0.0.tar.gz", hash = "sha256:37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577"}, ] [package.dependencies] @@ -695,6 +695,7 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, @@ -1138,4 +1139,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "98abf7e5d651e1b175bef4da352d9e68e6014d89f5ef3c740d0e7a07ee144999" +content-hash = "6fe09a92caa99a9c78341de1bd9d0ef4694f15080dd535bedca1272dfe807d31" diff --git a/pyproject.toml b/pyproject.toml index 7af9b569c1a..c925c427b13 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -119,5 +119,5 @@ settings-doc = "^4.3.1" colorama = "0.4.6" # Required on all platforms, not just win32 autodoc-pydantic = "^2.2.0" # Needed for settings-doc and autodoc -croniter = "^5.0.1" +croniter = "^6.0.0" jsonschema = "^4.17.0" diff --git a/requirements.txt b/requirements.txt index 9c6a066dc83..c654d6b8f34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -112,9 +112,9 @@ click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" \ colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 -croniter==5.0.1 ; python_version >= "3.10" and python_version < "4.0" \ - --hash=sha256:7d9b1ef25b10eece48fdf29d8ac52f9b6252abff983ac614ade4f3276294019e \ - --hash=sha256:eb28439742291f6c10b181df1a5ecf421208b1fc62ef44501daec1780a0b09e9 +croniter==6.0.0 ; python_version >= "3.10" and python_version < "4.0" \ + --hash=sha256:2f878c3856f17896979b2a4379ba1f09c83e374931ea15cc835c5dd2eee9b368 \ + --hash=sha256:37c504b313956114a983ece2c2b07790b1f1094fe9d81cc94739214748255577 docutils==0.20.1 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6 \ --hash=sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b @@ -347,6 +347,7 @@ pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "4.0" \ --hash=sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4 \ --hash=sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba \ --hash=sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8 \ + --hash=sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef \ --hash=sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5 \ --hash=sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd \ --hash=sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3 \