Re-organize Jumpstarter packages to allow sparse dependency tree per-package

.github/workflows/ruff.yaml

@@ -17,4 +17,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run ruff
-        uses: chartboost/ruff-action@v1
+        uses: astral-sh/ruff-action@v3
+        with:
+          version-file: "pyproject.toml"

.gitignore

@@ -160,3 +160,6 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+# Ruff cache
+.ruff_cache/

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-default_stages: [commit]
+default_stages: [pre-commit]
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.3.5

Makefile

@@ -1,5 +1,4 @@
-DRIVER_TARGETS = $(subst contrib/drivers/,driver-,$(wildcard contrib/drivers/*))
-LIB_TARGETS = $(subst contrib/libs/,lib-,$(wildcard contrib/libs/*))
+PKG_TARGETS = $(subst packages/,,$(wildcard packages/*))
 EXAMPLE_TARGETS = $(subst examples/,example-,$(wildcard examples/*))
 DOC_LISTEN ?= --host 127.0.0.1
 
@@ -14,16 +13,10 @@ serve-docs:
 clean-docs:
 	uv run --isolated --all-packages --group docs $(MAKE) -C docs clean
 
-test-jumpstarter:
-	uv run --isolated --package jumpstarter pytest jumpstarter tests
-
-test-driver-%: contrib/drivers/%
-	uv run --isolated --directory $< pytest
-
-test-lib-%: contrib/libs/%
+test-%: packages/%
 	uv run --isolated --directory $< pytest
 
-test-contrib: $(addprefix test-,$(DRIVER_TARGETS))
+test-packages: $(addprefix test-,$(PKG_TARGETS))
 
 clean-venv:
 	-rm -rf ./.venv
@@ -40,11 +33,14 @@ clean-test:
 sync:
 	uv sync --all-packages --all-extras
 
-test: test-jumpstarter test-contrib
+test: test-packages
+
+generate:
+	buf generate
 
 build:
 	uv build --all --out-dir dist
 
 clean: clean-docs clean-venv clean-build clean-test
 
-.PHONY: sync docs test test-jumpstarter test-contrib build clean-test clean-docs clean-venv clean-build
+.PHONY: sync docs test test-jumpstarter test-packages build clean-test clean-docs clean-venv clean-build

contrib/__templates__/create_driver.sh → __templates__/create_driver.sh

@@ -21,7 +21,7 @@ export AUTHOR_NAME=$3
 export AUTHOR_EMAIL=$4
 
 # create the driver directory
-DRIVER_DIRECTORY=contrib/drivers/${DRIVER_NAME}
+DRIVER_DIRECTORY=packages/jumpstarter_driver_${DRIVER_NAME}
 MODULE_DIRECTORY=${DRIVER_DIRECTORY}/jumpstarter_driver_${DRIVER_NAME}
 # create the module directories
 mkdir -p ${MODULE_DIRECTORY}
@@ -35,6 +35,5 @@ done
 
 for f in .gitignore pyproject.toml README.md examples/exporter.yaml; do
     echo "Creating: ${DRIVER_DIRECTORY}/${f}"
-    envsubst < contrib/__templates__/driver/${f}.tmpl > ${DRIVER_DIRECTORY}/${f}
+    envsubst < packages/__templates__/driver/${f}.tmpl > ${DRIVER_DIRECTORY}/${f}
 done
-

contrib/__templates__/driver/pyproject.toml.tmpl → __templates__/driver/pyproject.toml.tmpl

@@ -14,7 +14,7 @@ dependencies = [
 
 [tool.hatch.version]
 source = "vcs"
-raw-options = { 'root' = '../../../'}
+raw-options = { 'root' = '../../'}
 
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"

buf.gen.yaml

@@ -3,9 +3,9 @@ managed:
   enabled: true
 plugins:
   - remote: buf.build/protocolbuffers/python
-    out: .
+    out: ./packages/jumpstarter_protocol/jumpstarter_protocol
   - remote: buf.build/grpc/python
-    out: .
+    out: ./packages/jumpstarter_protocol/jumpstarter_protocol
 inputs:
   - git_repo: https://github.com/jumpstarter-dev/jumpstarter-protocol.git
     subdir: proto

examples/soc-pytest/jumpstarter_example_soc_pytest/test_on_rpi4.py

@@ -6,10 +6,9 @@
 import opendal
 import pexpect
 import pytest
+from jumpstarter_driver_network.adapters import PexpectAdapter
 from jumpstarter_imagehash import ImageHash
-
-from jumpstarter.client.adapters import PexpectAdapter
-from jumpstarter.testing.pytest import JumpstarterTest
+from jumpstarter_testing.pytest import JumpstarterTest
 
 log = logging.getLogger(__file__)
 
@@ -43,7 +42,7 @@ def test_setup_device(self, client, console):
             client.dutlink.storage.write_local_file("image/images/latest.raw")
         except opendal.exceptions.NotFound:
             pytest.exit(
-                "No image found, please enter the image directory and run `make`, " "more details in the README.md"
+                "No image found, please enter the image directory and run `make`, more details in the README.md"
             )
             return
         client.dutlink.storage.dut()

examples/soc-pytest/pyproject.toml

@@ -11,16 +11,14 @@ readme = "README.md"
 license = { text = "Apache-2.0" }
 requires-python = ">=3.11"
 dependencies = [
+  "pytest>=8.3.2",
     "jumpstarter",
-    "pytest>=8.3.2",
-    "jumpstarter_imagehash",
-    "jumpstarter_driver_dutlink",
+    "jumpstarter-testing",
+    "jumpstarter-imagehash",
+    "jumpstarter-driver-network",
+    "jumpstarter-driver-dutlink"
 ]
 
-[tool.uv.sources]
-jumpstarter-imagehash = { workspace = true }
-jumpstarter-driver-dutlink = { workspace = true }
-
 [tool.pytest.ini_options]
 addopts = "-s --ignore examples/pytest/test_on_rpi4.py"
 log_cli = 1