Merge pull request #178 from jumpstarter-dev/dep-group

mangelajo · web-flow · commit 30b7e637885e · 2024-11-08T15:56:11.000Z
Use PEP 735 Dependency Groups instead of uv specific dev-dependencies…
diff --git a/contrib/drivers/can/pyproject.toml b/contrib/drivers/can/pyproject.toml
@@ -15,15 +15,12 @@ dependencies = [
     "can-isotp>=2.0.6",
 ]
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "pytest>=8.3.2",
     "pytest-cov>=5.0.0",
 ]
 
-[tool.uv.sources]
-jumpstarter = { workspace = true }
-
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"
 source_archive = "https://github.com/jumpstarter-dev/repo/archive/{commit_hash}.zip"
diff --git a/contrib/drivers/dutlink/pyproject.toml b/contrib/drivers/dutlink/pyproject.toml
@@ -15,15 +15,12 @@ dependencies = [
     "pyusb>=1.2.1",
 ]
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "pytest>=8.3.2",
     "pytest-cov>=5.0.0",
 ]
 
-[tool.uv.sources]
-jumpstarter = { workspace = true }
-
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"
 source_archive = "https://github.com/jumpstarter-dev/repo/archive/{commit_hash}.zip"
diff --git a/contrib/drivers/raspberrypi/pyproject.toml b/contrib/drivers/raspberrypi/pyproject.toml
@@ -14,15 +14,12 @@ dependencies = [
     "gpiozero>=2.0.1",
 ]
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "pytest>=8.3.2",
     "pytest-cov>=5.0.0",
 ]
 
-[tool.uv.sources]
-jumpstarter = { workspace = true }
-
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"
 source_archive = "https://github.com/jumpstarter-dev/repo/archive/{commit_hash}.zip"
diff --git a/contrib/drivers/sdwire/pyproject.toml b/contrib/drivers/sdwire/pyproject.toml
@@ -13,15 +13,12 @@ dependencies = [
     "pyudev>=0.24.3",
 ]
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "pytest>=8.3.2",
     "pytest-cov>=5.0.0",
 ]
 
-[tool.uv.sources]
-jumpstarter = { workspace = true }
-
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"
 source_archive = "https://github.com/jumpstarter-dev/repo/archive/{commit_hash}.zip"
diff --git a/contrib/drivers/ustreamer/pyproject.toml b/contrib/drivers/ustreamer/pyproject.toml
@@ -14,15 +14,12 @@ dependencies = [
     "pillow>=10.4.0",
 ]
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "pytest>=8.3.2",
     "pytest-cov>=5.0.0",
 ]
 
-[tool.uv.sources]
-jumpstarter = { workspace = true }
-
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"
 source_archive = "https://github.com/jumpstarter-dev/repo/archive/{commit_hash}.zip"
diff --git a/contrib/libs/imagehash/pyproject.toml b/contrib/libs/imagehash/pyproject.toml
@@ -14,15 +14,12 @@ dependencies = [
     "jumpstarter",
 ]
 
-[tool.uv]
-dev-dependencies = [
+[dependency-groups]
+dev = [
     "pytest>=8.3.2",
     "pytest-cov>=5.0.0",
 ]
 
-[tool.uv.sources]
-jumpstarter = { workspace = true }
-
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"
 source_archive = "https://github.com/jumpstarter-dev/repo/archive/{commit_hash}.zip"
diff --git a/examples/automotive/pyproject.toml b/examples/automotive/pyproject.toml
@@ -12,6 +12,3 @@ requires-python = ">=3.11"
 dependencies = [
     "jumpstarter"
 ]
-
-[tool.uv.sources]
-jumpstarter = { workspace = true }
diff --git a/examples/soc-pytest/pyproject.toml b/examples/soc-pytest/pyproject.toml
@@ -17,7 +17,6 @@ dependencies = [
 ]
 
 [tool.uv.sources]
-jumpstarter = { workspace = true }
 jumpstarter-imagehash = { workspace = true }
 jumpstarter-driver-dutlink = { workspace = true }
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,11 +26,6 @@ dependencies = [
     "protobuf>=5.28.0",
 ]
 
-[project.optional-dependencies]
-pytest = [
-    "pytest>=8.3.2",
-]
-
 [dependency-groups]
 docs = [
     "sphinx<8.1.0",
@@ -70,6 +65,9 @@ source_archive = "https://github.com/jumpstarter-dev/repo/archive/{commit_hash}.
 [tool.uv.workspace]
 members = ["contrib/drivers/*", "contrib/libs/*", "examples/*"]
 
+[tool.uv.sources]
+jumpstarter = { workspace = true }
+
 [tool.ruff]
 exclude = ["jumpstarter/v1"]
 line-length = 120
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,3 @@ requires-python = ">=3.11"`
`12`	`12`	`dependencies = [`
`13`	`13`	`"jumpstarter"`
`14`	`14`	`]`
`15`		`-`
`16`		`-[tool.uv.sources]`
`17`		`-jumpstarter = { workspace = true }`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ dependencies = [`
`17`	`17`	`]`
`18`	`18`
`19`	`19`	`[tool.uv.sources]`
`20`		`-jumpstarter = { workspace = true }`
`21`	`20`	`jumpstarter-imagehash = { workspace = true }`
`22`	`21`	`jumpstarter-driver-dutlink = { workspace = true }`
`23`	`22`