This is an automated email from the ASF dual-hosted git repository. tn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tooling-atr-experiments.git
The following commit(s) were added to refs/heads/main by this push: new 330e1c3 avoid duplication of dependencies for poetry, add TODO 330e1c3 is described below commit 330e1c3ccc74c6e73538bab8625cca24d625ab71 Author: Thomas Neidhart <t...@apache.org> AuthorDate: Fri Feb 14 15:24:15 2025 +0100 avoid duplication of dependencies for poetry, add TODO --- poetry.lock | 2 +- pyproject.toml | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/poetry.lock b/poetry.lock index b541eb2..3e7b653 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2605,4 +2605,4 @@ propcache = ">=0.2.0" [metadata] lock-version = "2.1" python-versions = "~=3.13" -content-hash = "ef8075690ef0c336342f273462d074b3c73b8eea01e608cdfbbee93787178303" +content-hash = "7b2a7fad005d4107d9ead1e208a0ca85d80c486efa0fa4f8e90ee8578032f330" diff --git a/pyproject.toml b/pyproject.toml index 2766522..b12ea5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ readme = "README.md" requires-python = "~=3.13" dependencies = [ "alembic~=1.14", - "asfquart", + "asfquart", # TODO: convert asfquart from a source dependency to pypi or git dependency "cryptography~=44.0", "httpx~=0.27", "hypercorn~=0.17", @@ -29,9 +29,18 @@ dev = [ # Other configuration +# Poetry specific config + [tool.poetry] package-mode = false +# When both project.dependencies and tool.poetry.dependencies are specified, +# project.dependencies are used for metadata when building the project, +# tool.poetry.dependencies is only used to enrich project.dependencies for locking. +# so we only need to enrich the dependencies with the source location of asfquart +[tool.poetry.dependencies] +asfquart = { path = "./asfquart", develop = true } + [tool.poetry.group.dev.dependencies] djlint = "^1.36.4" mypy = "^1.15.0" @@ -39,14 +48,12 @@ pre-commit = ">=2.20.0" pyright = ">=1.1.393" ruff = ">=0.9.4" -[tool.poetry.group.main.dependencies] -alembic = "~=1.14" -asfquart = { path = "./asfquart", develop = true } -cryptography = "~=44.0" -httpx = "~=0.27" -hypercorn = "~=0.17" -python-gnupg = "~=0.5" -sqlmodel = "~=0.0" +# UV specific configuration + +[tool.uv.sources] +asfquart = { path = "./asfquart", editable = true } + +# Additional tools [tool.pyright] include = ["atr"] @@ -67,9 +74,6 @@ lint.ignore = [] line-length = 120 exclude = ["asfquart"] -[tool.uv.sources] -asfquart = { path = "./asfquart", editable = true } - [tool.mypy] python_version = "3.13" exclude = ["asfquart"] --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tooling.apache.org For additional commands, e-mail: dev-h...@tooling.apache.org