From a62bc678b7256598fe7ef1c13695cd95994ea5ca Mon Sep 17 00:00:00 2001 From: Christoph Zwerschke Date: Fri, 22 Mar 2024 15:46:49 +0000 Subject: [PATCH] Fix and update dependencies --- .pre-commit-config.yaml | 2 +- .pyproject_generation/pyproject_custom.toml | 3 +- lock/requirements-dev.txt | 74 ++++++++++----------- lock/requirements.txt | 25 ++++++- openapi.yaml | 2 +- pyproject.toml | 3 +- 6 files changed, 65 insertions(+), 44 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 60c8352..2ac76cd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,7 @@ repos: - id: no-commit-to-branch args: [--branch, dev, --branch, int, --branch, main] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.3.3 + rev: v0.3.4 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/.pyproject_generation/pyproject_custom.toml b/.pyproject_generation/pyproject_custom.toml index 6cda32c..d786821 100644 --- a/.pyproject_generation/pyproject_custom.toml +++ b/.pyproject_generation/pyproject_custom.toml @@ -1,11 +1,12 @@ [project] name = "wps" -version = "2.0.0" +version = "2.0.1" description = "Work Package Service" dependencies = [ "ghga-event-schemas~=3.1.0", "ghga-service-commons[api,auth,crypt]>=3.1.1", "hexkit[akafka,mongodb]>=2.1.1", + "httpx>=0.27.0", "typer>=0.9.0", ] diff --git a/lock/requirements-dev.txt b/lock/requirements-dev.txt index a044ca8..d4db6c5 100644 --- a/lock/requirements-dev.txt +++ b/lock/requirements-dev.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --refresh --generate-hashes --output-file /workspace/lock/requirements-dev.txt /tmp/tmpywrbbwee/pyproject.toml /workspace/lock/requirements-dev.in +# uv pip compile --refresh --generate-hashes --output-file lock/requirements-dev.txt /tmp/tmprmuwr9ob/pyproject.toml lock/requirements-dev.in aiokafka==0.8.1 \ --hash=sha256:1e24839088fd6d3ff481cc09a48ea487b997328df11630bc0a1b88255edbcfe9 \ --hash=sha256:1f43d2afd7d3e4407ada8d754895fad7c344ca00648a8a38418d76564eaaf6cd \ @@ -930,24 +930,24 @@ rpds-py==0.18.0 \ # via # jsonschema # referencing -ruff==0.3.3 \ - --hash=sha256:0171aab5fecdc54383993389710a3d1227f2da124d76a2784a7098e818f92d61 \ - --hash=sha256:0da458989ce0159555ef224d5b7c24d3d2e4bf4c300b85467b08c3261c6bc6a8 \ - --hash=sha256:1eca7ff7a47043cf6ce5c7f45f603b09121a7cc047447744b029d1b719278eb5 \ - --hash=sha256:2700a804d5336bcffe063fd789ca2c7b02b552d2e323a336700abb8ae9e6a3f8 \ - --hash=sha256:352e95ead6964974b234e16ba8a66dad102ec7bf8ac064a23f95371d8b198aab \ - --hash=sha256:38671be06f57a2f8aba957d9f701ea889aa5736be806f18c0cd03d6ff0cbca8d \ - --hash=sha256:45817af234605525cdf6317005923bf532514e1ea3d9270acf61ca2440691376 \ - --hash=sha256:5a6cbf216b69c7090f0fe4669501a27326c34e119068c1494f35aaf4cc683778 \ - --hash=sha256:79bca3a03a759cc773fca69e0bdeac8abd1c13c31b798d5bb3c9da4a03144a9f \ - --hash=sha256:8d6ab88c81c4040a817aa432484e838aaddf8bfd7ca70e4e615482757acb64f8 \ - --hash=sha256:973a0e388b7bc2e9148c7f9be8b8c6ae7471b9be37e1cc732f8f44a6f6d7720d \ - --hash=sha256:b24c19e8598916d9c6f5a5437671f55ee93c212a2c4c569605dc3842b6820386 \ - --hash=sha256:be90bcae57c24d9f9d023b12d627e958eb55f595428bafcb7fec0791ad25ddfc \ - --hash=sha256:cfa60d23269d6e2031129b053fdb4e5a7b0637fc6c9c0586737b962b2f834493 \ - --hash=sha256:e7d3f6762217c1da954de24b4a1a70515630d29f71e268ec5000afe81377642d \ - --hash=sha256:f2831ec6a580a97f1ea82ea1eda0401c3cdf512cf2045fa3c85e8ef109e87de0 \ - --hash=sha256:fd66469f1a18fdb9d32e22b79f486223052ddf057dc56dea0caaf1a47bdfaf4e +ruff==0.3.4 \ + --hash=sha256:3f3860057590e810c7ffea75669bdc6927bfd91e29b4baa9258fd48b540a4365 \ + --hash=sha256:519cf6a0ebed244dce1dc8aecd3dc99add7a2ee15bb68cf19588bb5bf58e0488 \ + --hash=sha256:60c870a7d46efcbc8385d27ec07fe534ac32f3b251e4fc44b3cbfd9e09609ef4 \ + --hash=sha256:64abeed785dad51801b423fa51840b1764b35d6c461ea8caef9cf9e5e5ab34d9 \ + --hash=sha256:6810563cc08ad0096b57c717bd78aeac888a1bfd38654d9113cb3dc4d3f74232 \ + --hash=sha256:6fc14fa742e1d8f24910e1fff0bd5e26d395b0e0e04cc1b15c7c5e5fe5b4af91 \ + --hash=sha256:986f2377f7cf12efac1f515fc1a5b753c000ed1e0a6de96747cdf2da20a1b369 \ + --hash=sha256:98e98300056445ba2cc27d0b325fd044dc17fcc38e4e4d2c7711585bd0a958ed \ + --hash=sha256:af27ac187c0a331e8ef91d84bf1c3c6a5dea97e912a7560ac0cef25c526a4102 \ + --hash=sha256:bb0acfb921030d00070539c038cd24bb1df73a2981e9f55942514af8b17be94e \ + --hash=sha256:c4fd98e85869603e65f554fdc5cddf0712e352fe6e61d29d5a6fe087ec82b76c \ + --hash=sha256:cf133dd744f2470b347f602452a88e70dadfbe0fcfb5fd46e093d55da65f82f7 \ + --hash=sha256:cf187a7e7098233d0d0c71175375c5162f880126c4c716fa28a8ac418dcf3378 \ + --hash=sha256:d3ee7880f653cc03749a3bfea720cf2a192e4f884925b0cf7eecce82f0ce5854 \ + --hash=sha256:de0d5069b165e5a32b3c6ffbb81c350b1e3d3483347196ffdf86dc0ef9e37dd6 \ + --hash=sha256:df52972138318bc7546d92348a1ee58449bc3f9eaf0db278906eb511889c4b50 \ + --hash=sha256:f0f4484c6541a99862b693e13a151435a279b271cff20e37101116a21e2a1ad1 setuptools==69.2.0 \ --hash=sha256:0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e \ --hash=sha256:c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c @@ -1021,24 +1021,24 @@ urllib3==2.2.1 \ # docker # requests # testcontainers -uv==0.1.22 \ - --hash=sha256:144ffabe5f2519bf371bfd3db074b3d0952db31263fbd9b5b9a18efbc90ee772 \ - --hash=sha256:23ce9a081e046d40ea9582824f1ec1a64830e7292f5885b42526baa0d9d834e1 \ - --hash=sha256:275892300f842170eb03e15ee077d9f2327966d3e12048568230a13cd8de7ba5 \ - --hash=sha256:28ea7dd1e9048610a13b47976c3f45ab1cc99e96f085c9e6659f024b46dad870 \ - --hash=sha256:4936331140392c057e56e29751bcf0461ba5ec92592bf2082f7a85e8170c4051 \ - --hash=sha256:4d23fa6693d5026b45df75b996a3f43166d10caa690925f9ee55e2d5ff61cfa9 \ - --hash=sha256:6ae068131fd255bf55f48c077e54558184a1a23fcefbb78de3189853d121cf29 \ - --hash=sha256:94f45b92d48489867c2b07a5ec2b1ead6994d46573f9066d3473e08a04f662e4 \ - --hash=sha256:9b0d5d062484dcf97e191d4a28de23974ba6a384315300f9a439268506460b7d \ - --hash=sha256:9c238d417a67aab57c2d407778c86078f92e12d127bc4076f5565a9203f3e4f5 \ - --hash=sha256:b86f7c1ccbffa34cf82d2b5ff6b8650d3a66f4b9496b8fd07b18420ae232ebd7 \ - --hash=sha256:baf5c2c0a1097dc29da6ab610c90b798d5e5e97aaace2e66cb474a8e2c1e0361 \ - --hash=sha256:dee413bac546c359a37065e9b8ef1d48210517763000e569ed577745da11c321 \ - --hash=sha256:e83c858770ad2eced9750bd6b7aed320d74e4a35a9408895de506bbc7b11343c \ - --hash=sha256:f350292267f361c0aeb8c68f81e81d18e7eb383d8323dd10017ee93747471deb \ - --hash=sha256:fa0f0eb1306082c65f042c4c54d6a7c1078b9b3ad65da4af7df11fba91848e21 \ - --hash=sha256:fefb107a2fb4eac874cdf1066f8cc40c5112853890fa49520e13975a6ad2778a +uv==0.1.23 \ + --hash=sha256:017693306c526bbca13a794986c0f4b20d73ff38b158ed030c51115a792e07e9 \ + --hash=sha256:090a5f29ecbbbfbb2ab3bf74f6155c1d189b9dad076c0ef9de63a87367682f16 \ + --hash=sha256:231fa9963d85a6a21012eb87e6af60eb2c4f3e1f12d90d69ec12e5a2d0d4c9dd \ + --hash=sha256:246022f7de2f10f20d38e5a05f6eb761f6f1a4b3860db1db652bc026aa17eb98 \ + --hash=sha256:2555765ba0345afbe0baa7f32bae0607ff12e98d53a02c43da60f082756f5eea \ + --hash=sha256:31250c9e24c7c9fd3acf90a26f0201b54876add94d67f16bf235b5397e600def \ + --hash=sha256:6f28613927b2749c93f6b6187e3eb7506719a3a15397ab22c3edb40df5bb9cef \ + --hash=sha256:845004f3c33d50f874c037b7f070d627abd553e440b07c88ce57cc23a708d377 \ + --hash=sha256:899b3e7567a6173c27b1eced8b2b5cd7dd2bd4fd2e52f62f7a5f8537ee22c466 \ + --hash=sha256:8ea368525354b2b7f4b91e7532621087dc3959482ea010f8e06ab3891ea4d3c9 \ + --hash=sha256:96b6c6c65541d3ef429c245684335cfc7db6515c13f66687bbd5aca258de6af9 \ + --hash=sha256:cfbcd617bd89442de3a19f6b5055239a9aa8f5301dc5aea8e85b36fa6e459679 \ + --hash=sha256:d63b9205933651d0630ad3c50e2d3c328f3cabfcf1d8d875bbc741723597e18e \ + --hash=sha256:d9d1d6d2bca50b9ea2ed764a6931b53995f6b5dbf3def9eafbcec57a88b4a6e2 \ + --hash=sha256:dd8bdc1fb385c3901626d117a23b1cba1ccf4a2cbebe0101a6f6811904cbacc2 \ + --hash=sha256:e70205566b8a8fd244c96c8889f5e5597ff69a848c135d006eed6336d77dcc8d \ + --hash=sha256:ee4fb9a8496a7276c11fbd21cd7db425682102497eb720313a9c8e5bc9a4d21a uvicorn==0.27.1 \ --hash=sha256:3d9a267296243532db80c83a959a3400502165ade2c1338dea4e67915fd4745a \ --hash=sha256:5c89da2f3895767472a35556e539fd59f7edbe9b1e9c0e1c99eebeadc61838e4 diff --git a/lock/requirements.txt b/lock/requirements.txt index 43a91f4..c0b374a 100644 --- a/lock/requirements.txt +++ b/lock/requirements.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --refresh --generate-hashes --output-file /workspace/lock/requirements.txt /tmp/tmpywrbbwee/pyproject.toml -c /workspace/lock/requirements-dev.txt +# uv pip compile --refresh --generate-hashes --output-file lock/requirements.txt /tmp/tmprmuwr9ob/pyproject.toml -c lock/requirements-dev.txt aiokafka==0.8.1 \ --hash=sha256:1e24839088fd6d3ff481cc09a48ea487b997328df11630bc0a1b88255edbcfe9 \ --hash=sha256:1f43d2afd7d3e4407ada8d754895fad7c344ca00648a8a38418d76564eaaf6cd \ @@ -35,6 +35,7 @@ anyio==4.3.0 \ --hash=sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8 \ --hash=sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6 # via + # httpx # starlette # watchfiles async-timeout==4.0.3 \ @@ -76,6 +77,12 @@ bcrypt==4.1.2 \ --hash=sha256:f70d9c61f9c4ca7d57f3bfe88a5ccf62546ffbadf3681bb1e268d9d2e41c91a7 \ --hash=sha256:fbe188b878313d01b7718390f31528be4010fed1faa798c5a1d0469c9c48c369 # via crypt4gh +certifi==2024.2.2 \ + --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ + --hash=sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1 + # via + # httpcore + # httpx cffi==1.16.0 \ --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \ --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \ @@ -208,11 +215,17 @@ ghga-service-commons==3.1.1 \ h11==0.14.0 \ --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \ --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761 - # via uvicorn + # via + # httpcore + # uvicorn hexkit==2.1.1 \ --hash=sha256:1f0a0e20a6d56fe4fa5e0b1c798df4720d2f84e20cbe7f16464bd5107e109c90 \ --hash=sha256:3ec0f9690eb573125e22bce0c662019c9708cd17f8d2353396dc4496577718c3 # via ghga-service-commons +httpcore==1.0.4 \ + --hash=sha256:ac418c1db41bade2ad53ae2f3834a3a0f5ae76b56cf5aa497d2d033384fc7d73 \ + --hash=sha256:cb2839ccfcba0d2d3c1131d3c3e26dfc327326fbe7a5dc0dbfe9f6c9151bb022 + # via httpx httptools==0.6.1 \ --hash=sha256:00d5d4b68a717765b1fabfd9ca755bd12bf44105eeb806c03d1962acd9b8e563 \ --hash=sha256:0ac5a0ae3d9f4fe004318d64b8a854edd85ab76cffbf7ef5e32920faef62f142 \ @@ -251,12 +264,16 @@ httptools==0.6.1 \ --hash=sha256:e57997ac7fb7ee43140cc03664de5f268813a481dff6245e0075925adc6aa185 \ --hash=sha256:fe467eb086d80217b7584e61313ebadc8d187a4d95bb62031b7bab4b205c3ba3 # via uvicorn +httpx==0.27.0 \ + --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \ + --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5 idna==3.6 \ --hash=sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca \ --hash=sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f # via # anyio # email-validator + # httpx jsonschema==4.21.1 \ --hash=sha256:7996507afae316306f9e2290407761157c6f78002dcf7419acb99822143d1c6f \ --hash=sha256:85727c00279f5fa6bedbe6238d2aa6403bedd8b4864ab11207d07df3cc1b2ee5 @@ -653,7 +670,9 @@ rpds-py==0.18.0 \ sniffio==1.3.1 \ --hash=sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2 \ --hash=sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc - # via anyio + # via + # anyio + # httpx starlette==0.36.3 \ --hash=sha256:13d429aa93a61dc40bf503e8c801db1f1bca3dc706b10ef2434a36123568f044 \ --hash=sha256:90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 diff --git a/openapi.yaml b/openapi.yaml index da25a57..d0c56dc 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -142,7 +142,7 @@ components: info: description: A service managing work packages for the GHGA CLI title: Work Package Service - version: 2.0.0 + version: 2.0.1 openapi: 3.1.0 paths: /health: diff --git a/pyproject.toml b/pyproject.toml index 4cb3901..f827af3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,12 +22,13 @@ classifiers = [ "Intended Audience :: Developers", ] name = "wps" -version = "2.0.0" +version = "2.0.1" description = "Work Package Service" dependencies = [ "ghga-event-schemas~=3.1.0", "ghga-service-commons[api,auth,crypt]>=3.1.1", "hexkit[akafka,mongodb]>=2.1.1", + "httpx>=0.27.0", "typer>=0.9.0", ]