From a42740fad7f303b90b47482fe9d11496b8af2b97 Mon Sep 17 00:00:00 2001 From: David Butenhof Date: Fri, 6 Dec 2024 10:23:54 -0500 Subject: [PATCH] Flailing... The GitHub Action environment is unhappy with `uvicorn` 0.15; does the latest 0.32.1 work with everything else? Will that make GitHub happy? --- backend/poetry.lock | 33 ++++++++------------------------- backend/pyproject.toml | 5 +++-- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/backend/poetry.lock b/backend/poetry.lock index d6e92293..27112850 100644 --- a/backend/poetry.lock +++ b/backend/poetry.lock @@ -155,23 +155,6 @@ doc = ["Sphinx", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd- test = ["anyio[trio]", "coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "mock (>=4)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] trio = ["trio (<0.22)"] -[[package]] -name = "asgiref" -version = "3.8.1" -description = "ASGI specs, helper code, and adapters" -optional = false -python-versions = ">=3.8" -files = [ - {file = "asgiref-3.8.1-py3-none-any.whl", hash = "sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47"}, - {file = "asgiref-3.8.1.tar.gz", hash = "sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590"}, -] - -[package.dependencies] -typing-extensions = {version = ">=4", markers = "python_version < \"3.11\""} - -[package.extras] -tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] - [[package]] name = "async-generator" version = "1.10" @@ -2029,22 +2012,22 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "uvicorn" -version = "0.14.0" +version = "0.32.1" description = "The lightning-fast ASGI server." optional = false -python-versions = "*" +python-versions = ">=3.8" files = [ - {file = "uvicorn-0.14.0-py3-none-any.whl", hash = "sha256:2a76bb359171a504b3d1c853409af3adbfa5cef374a4a59e5881945a97a93eae"}, - {file = "uvicorn-0.14.0.tar.gz", hash = "sha256:45ad7dfaaa7d55cab4cd1e85e03f27e9d60bc067ddc59db52a2b0aeca8870292"}, + {file = "uvicorn-0.32.1-py3-none-any.whl", hash = "sha256:82ad92fd58da0d12af7482ecdb5f2470a04c9c9a53ced65b9bbb4a205377602e"}, + {file = "uvicorn-0.32.1.tar.gz", hash = "sha256:ee9519c246a72b1c084cea8d3b44ed6026e78a4a309cbedae9c37e4cb9fbb175"}, ] [package.dependencies] -asgiref = ">=3.3.4" -click = ">=7" +click = ">=7.0" h11 = ">=0.8" +typing-extensions = {version = ">=4.0", markers = "python_version < \"3.11\""} [package.extras] -standard = ["PyYAML (>=5.1)", "colorama (>=0.4)", "httptools (==0.2.*)", "python-dotenv (>=0.13)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "watchgod (>=0.6)", "websockets (>=9.1)"] +standard = ["colorama (>=0.4)", "httptools (>=0.6.3)", "python-dotenv (>=0.13)", "pyyaml (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "watchfiles (>=0.13)", "websockets (>=10.4)"] [[package]] name = "uvloop" @@ -2333,4 +2316,4 @@ propcache = ">=0.2.0" [metadata] lock-version = "2.0" python-versions = "^3.9.20" -content-hash = "1bb453c692ad142c78b474c0a18f23eeab5513ce39f394ce6ca81fd8cef9a270" +content-hash = "228bb1eab40ca6a1e5329f4c746b7608aaf2c08cc3b4c0d40fe1430e374f8121" diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 132ee1d4..f93f169b 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -20,7 +20,7 @@ httptools = "^0.2.0" elasticsearch = "7.13.4" fastapi = "^0.104.1" pydantic = "2.3.0" -uvicorn = "^0.14.0" +uvicorn = "^0.32.0" trio = "^0.18.0" aiohttp = "^3.7.4" httpx = "^0.18.1" @@ -58,7 +58,8 @@ deps = [ "pytest-asyncio", "pytest-cov", ] -commands = [["pytest", "-s", "--cov-report=term", "--cov-branch", "--cov-report=html:{envtmpdir}/coverage.db", "--cov=app", "tests"]] +allowlist_externals = ["poetry"] +commands = [["poetry", "show"],["pytest", "-s", "--cov-report=term", "--cov-branch", "--cov-report=html:{envtmpdir}/coverage.db", "--cov=app", "tests"]] [tool.tox.env.format] description = "check code format"