diff --git a/poetry.lock b/poetry.lock index 5ce6b0af00..9677775ad2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2724,6 +2724,7 @@ markers = "extra == \"proxy\"" files = [ {file = "litellm_proxy_extras-0.2.20-py3-none-any.whl", hash = "sha256:80ebe03be210eed99ddab0bf8e1a14169f24a502ecdaa98f4bb5032ebe65a944"}, {file = "litellm_proxy_extras-0.2.20.tar.gz", hash = "sha256:8dea657f965122490be480327995ce534e75dc96778cb3e05c562c7996f85cce"}, +<<<<<<< HEAD ] [[package]] @@ -2736,6 +2737,8 @@ groups = ["main"] files = [ {file = "madoka-0.7.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:7521eee9ace30b376bb54fdcb2cb42bf6b7a0346b0d0b612f25f3299aa4a95af"}, {file = "madoka-0.7.1.tar.gz", hash = "sha256:e258baa84fc0a3764365993b8bf5e1b065383a6ca8c9f862fb3e3e709843fae7"}, +======= +>>>>>>> 0cb68da91d (bump v extras) ] [[package]] @@ -4040,21 +4043,6 @@ timezone = ["tzdata ; platform_system == \"Windows\""] xlsx2csv = ["xlsx2csv (>=0.8.0)"] xlsxwriter = ["xlsxwriter"] -[[package]] -name = "pondpond" -version = "1.4.1" -description = "Pond is a high performance object-pooling library for Python." -optional = false -python-versions = ">=3.8" -groups = ["main"] -files = [ - {file = "pondpond-1.4.1-py3-none-any.whl", hash = "sha256:641028ead4e8018ca6de1220c660ddd6d6fbf62a60e72f410655dd0451d82880"}, - {file = "pondpond-1.4.1.tar.gz", hash = "sha256:8afa34b869d1434d21dd2ec12644abc3b1733fcda8fcf355300338a13a79bb7b"}, -] - -[package.dependencies] -madoka = ">=0.7.1" - [[package]] name = "priority" version = "2.0.0" @@ -6754,4 +6742,4 @@ utils = ["numpydoc"] [metadata] lock-version = "2.1" python-versions = ">=3.8.1,<4.0, !=3.9.7" -content-hash = "9e20685127a280c3a2b42c2626490ee0af32c8716d7d78b72cd86c8c0308a088" +content-hash = "6ea59a97b3d69dc5fcc45645131e2fc843ec533854dba19852cecf8e10da5e7a" \ No newline at end of file