From ff0bd63b1e1e6ba28997ea0f3fa8ea2ea663e532 Mon Sep 17 00:00:00 2001 From: Adrien Vannson Date: Thu, 18 Jun 2026 18:35:08 +0200 Subject: [PATCH] Move dependencies to root --- betterproto2/pyproject.toml | 17 ------ betterproto2_compiler/pyproject.toml | 14 ----- pyproject.toml | 20 +++++++ uv.lock | 82 +++++++--------------------- 4 files changed, 40 insertions(+), 93 deletions(-) diff --git a/betterproto2/pyproject.toml b/betterproto2/pyproject.toml index 6739817..da05f43 100644 --- a/betterproto2/pyproject.toml +++ b/betterproto2/pyproject.toml @@ -25,23 +25,6 @@ pydantic = ["pydantic>=2.11.5"] protobuf = ["protobuf>=5.29.3"] all = ["grpclib>=0.4.8", "grpcio>=1.72.1", "pydantic>=2.11.5", "protobuf>=5.29.3"] -[dependency-groups] -dev = [ - "ipykernel>=6.29.5", - "mkdocs-material>=9.6.14", - "mkdocstrings[python]>=0.29.1", - "pyright>=1.1.401", - "ruff==0.15.17", -] -test = [ - "cachelib>=0.13.0", - "poethepoet>=0.34.0", - "pytest>=8.4.0", - "pytest-asyncio>=1.0.0", - "pytest-cov>=6.1.1", - "pytest-mock>=3.14.1", -] - [tool.uv] package = true default-groups = "all" diff --git a/betterproto2_compiler/pyproject.toml b/betterproto2_compiler/pyproject.toml index 497fdad..7237444 100644 --- a/betterproto2_compiler/pyproject.toml +++ b/betterproto2_compiler/pyproject.toml @@ -31,20 +31,6 @@ Repository = "https://github.com/betterproto/python-betterproto2" [project.scripts] protoc-gen-python_betterproto2 = "betterproto2_compiler.plugin:main" -[dependency-groups] -dev = [ - "buf-bin", - "grpcio-tools>=1.54.2,<2", - "poethepoet>=0.32.2,<0.47", - "pyright>=1.1.391,<2", - "ipykernel>=6.29.5,<8", - "ruff==0.15.17", -] -test = [ - "pytest>=8.3.4,<10", - "protobuf>=5.29.3,<6", -] - [tool.uv] package = true default-groups = "all" diff --git a/pyproject.toml b/pyproject.toml index 44d5993..8b14353 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,22 @@ [tool.uv.workspace] members = ["betterproto2", "betterproto2_compiler"] + +[dependency-groups] +dev = [ + "buf-bin", + "grpcio-tools>=1.54.2,<2", + "ipykernel>=6.29.5", + "mkdocs-material>=9.6.14", + "mkdocstrings[python]>=0.29.1", + "poethepoet>=0.34.0,<0.47", + "pyright>=1.1.401,<2", + "ruff==0.15.17", +] +test = [ + "cachelib>=0.13.0", + "protobuf>=5.29.3,<6", + "pytest>=8.4.0,<10", + "pytest-asyncio>=1.0.0", + "pytest-cov>=6.1.1", + "pytest-mock>=3.14.1", +] diff --git a/uv.lock b/uv.lock index daf83b8..13e89cc 100644 --- a/uv.lock +++ b/uv.lock @@ -12,6 +12,26 @@ members = [ "betterproto2-compiler", ] +[manifest.dependency-groups] +dev = [ + { name = "buf-bin" }, + { name = "grpcio-tools", specifier = ">=1.54.2,<2" }, + { name = "ipykernel", specifier = ">=6.29.5" }, + { name = "mkdocs-material", specifier = ">=9.6.14" }, + { name = "mkdocstrings", extras = ["python"], specifier = ">=0.29.1" }, + { name = "poethepoet", specifier = ">=0.34.0,<0.47" }, + { name = "pyright", specifier = ">=1.1.401,<2" }, + { name = "ruff", specifier = "==0.15.17" }, +] +test = [ + { name = "cachelib", specifier = ">=0.13.0" }, + { name = "protobuf", specifier = ">=5.29.3,<6" }, + { name = "pytest", specifier = ">=8.4.0,<10" }, + { name = "pytest-asyncio", specifier = ">=1.0.0" }, + { name = "pytest-cov", specifier = ">=6.1.1" }, + { name = "pytest-mock", specifier = ">=3.14.1" }, +] + [[package]] name = "annotated-types" version = "0.7.0" @@ -99,23 +119,6 @@ pydantic = [ { name = "pydantic" }, ] -[package.dev-dependencies] -dev = [ - { name = "ipykernel" }, - { name = "mkdocs-material" }, - { name = "mkdocstrings", extra = ["python"] }, - { name = "pyright" }, - { name = "ruff" }, -] -test = [ - { name = "cachelib" }, - { name = "poethepoet" }, - { name = "pytest" }, - { name = "pytest-asyncio" }, - { name = "pytest-cov" }, - { name = "pytest-mock" }, -] - [package.metadata] requires-dist = [ { name = "grpcio", marker = "extra == 'all'", specifier = ">=1.72.1" }, @@ -131,23 +134,6 @@ requires-dist = [ ] provides-extras = ["grpcio", "grpclib", "pydantic", "protobuf", "all"] -[package.metadata.requires-dev] -dev = [ - { name = "ipykernel", specifier = ">=6.29.5" }, - { name = "mkdocs-material", specifier = ">=9.6.14" }, - { name = "mkdocstrings", extras = ["python"], specifier = ">=0.29.1" }, - { name = "pyright", specifier = ">=1.1.401" }, - { name = "ruff", specifier = "==0.15.17" }, -] -test = [ - { name = "cachelib", specifier = ">=0.13.0" }, - { name = "poethepoet", specifier = ">=0.34.0" }, - { name = "pytest", specifier = ">=8.4.0" }, - { name = "pytest-asyncio", specifier = ">=1.0.0" }, - { name = "pytest-cov", specifier = ">=6.1.1" }, - { name = "pytest-mock", specifier = ">=3.14.1" }, -] - [[package]] name = "betterproto2-compiler" version = "0.10.1" @@ -160,20 +146,6 @@ dependencies = [ { name = "typing-extensions" }, ] -[package.dev-dependencies] -dev = [ - { name = "buf-bin" }, - { name = "grpcio-tools" }, - { name = "ipykernel" }, - { name = "poethepoet" }, - { name = "pyright" }, - { name = "ruff" }, -] -test = [ - { name = "protobuf" }, - { name = "pytest" }, -] - [package.metadata] requires-dist = [ { name = "betterproto2", editable = "betterproto2" }, @@ -183,20 +155,6 @@ requires-dist = [ { name = "typing-extensions", specifier = ">=4.7.1,<5" }, ] -[package.metadata.requires-dev] -dev = [ - { name = "buf-bin" }, - { name = "grpcio-tools", specifier = ">=1.54.2,<2" }, - { name = "ipykernel", specifier = ">=6.29.5,<8" }, - { name = "poethepoet", specifier = ">=0.32.2,<0.47" }, - { name = "pyright", specifier = ">=1.1.391,<2" }, - { name = "ruff", specifier = "==0.15.17" }, -] -test = [ - { name = "protobuf", specifier = ">=5.29.3,<6" }, - { name = "pytest", specifier = ">=8.3.4,<10" }, -] - [[package]] name = "buf-bin" version = "1.71.0"