DUNE-DAQ · jcfreeman2 · Sep 23, 2025
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,20 +4,24 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "druncschema"
+description = "Schema definitions and compilation script for drunc"
+version = "0.11.3"
+readme = "docs/README.md"
 requires-python = ">=3.10"
-dynamic = ["version", "readme"]
 dependencies = [
-    "grpcio==1.68.0",
-    "grpcio-status==1.68.0",
-    "grpcio-tools==1.68.0",
-    "googleapis-common-protos==1.66.0"
+    "click",
+    "grpcio",
+    "grpcio-status",
+    "grpcio-tools",
+    "googleapis-common-protos",
+    "rich",
 ]
+
 authors = [
     {name = "Pierre Lasorak", email = "p.lasorak@imperial.ac.uk"},
     {name = "Pawel Plesniak", email = "pawel.plesniak15@imperial.ac.uk"},
     {name = "Claudia Su", email = "claudia.su@physics.ox.ac.uk"}
 ]
-description = "Schema definitions and compilation script for drunc"
 
 [project.optional-dependencies]
 dev = ["ruff", "pre-commit", "pytest", "mypy-protobuf", "types-protobuf"]
@@ -29,18 +33,14 @@ Repository = "https://github.com/DUNE-DAQ/druncschema"
 [project.scripts]
 druncschema-generate-protos = "druncschema.apps.__main_generate_protos__:main"
 
-[tool.setuptools.dynamic]
-version = {attr = "druncschema.__version__"}
-readme = {file = ["docs/README.md"]}
-
 [tool.setuptools.packages.find]
-where = ["python_not_for_dunedaq"]
+where = ["src"]
 
 [tool.ruff]
 exclude = [
-    "python_not_for_dunedaq/druncschema.egg-info",
-    "python_not_for_dunedaq/*/*_pb2.py*",
-    "python_not_for_dunedaq/*/*_pb2_grpc.py",
+    "src/druncschema.egg-info",
+    "src/*/*_pb2.py*",
+    "src/*/*_pb2_grpc.py",
 ]
 
 [tool.ruff.lint]

diff --git a/...n_not_for_dunedaq/druncschema/__init__.py → src/druncschema/__init__.py b/...n_not_for_dunedaq/druncschema/__init__.py → src/druncschema/__init__.py
@@ -1,2 +1 @@
 # This directory is _NOT_ to be used for dune daq, this is solely when one wants to run standalone without any dunedaq dependency.
-__version__='0.11.3'
diff --git a/..._for_dunedaq/druncschema/apps/__init__.py → src/druncschema/apps/__init__.py b/..._for_dunedaq/druncschema/apps/__init__.py → src/druncschema/apps/__init__.py
diff --git a/...ncschema/apps/__main_generate_protos__.py → ...ncschema/apps/__main_generate_protos__.py b/...ncschema/apps/__main_generate_protos__.py → ...ncschema/apps/__main_generate_protos__.py
diff --git a/...for_dunedaq/druncschema/authoriser_pb2.py → src/druncschema/authoriser_pb2.py b/...for_dunedaq/druncschema/authoriser_pb2.py → src/druncschema/authoriser_pb2.py
diff --git a/...or_dunedaq/druncschema/authoriser_pb2.pyi → src/druncschema/authoriser_pb2.pyi b/...or_dunedaq/druncschema/authoriser_pb2.pyi → src/druncschema/authoriser_pb2.pyi
diff --git a/...unedaq/druncschema/authoriser_pb2_grpc.py → src/druncschema/authoriser_pb2_grpc.py b/...unedaq/druncschema/authoriser_pb2_grpc.py → src/druncschema/authoriser_pb2_grpc.py
diff --git a/..._for_dunedaq/druncschema/broadcast_pb2.py → src/druncschema/broadcast_pb2.py b/..._for_dunedaq/druncschema/broadcast_pb2.py → src/druncschema/broadcast_pb2.py
diff --git a/...for_dunedaq/druncschema/broadcast_pb2.pyi → src/druncschema/broadcast_pb2.pyi b/...for_dunedaq/druncschema/broadcast_pb2.pyi → src/druncschema/broadcast_pb2.pyi
diff --git a/...dunedaq/druncschema/broadcast_pb2_grpc.py → src/druncschema/broadcast_pb2_grpc.py b/...dunedaq/druncschema/broadcast_pb2_grpc.py → src/druncschema/broadcast_pb2_grpc.py
diff --git a/...for_dunedaq/druncschema/controller_pb2.py → src/druncschema/controller_pb2.py b/...for_dunedaq/druncschema/controller_pb2.py → src/druncschema/controller_pb2.py
diff --git a/...or_dunedaq/druncschema/controller_pb2.pyi → src/druncschema/controller_pb2.pyi b/...or_dunedaq/druncschema/controller_pb2.pyi → src/druncschema/controller_pb2.pyi
diff --git a/...unedaq/druncschema/controller_pb2_grpc.py → src/druncschema/controller_pb2_grpc.py b/...unedaq/druncschema/controller_pb2_grpc.py → src/druncschema/controller_pb2_grpc.py
diff --git a/...or_dunedaq/druncschema/description_pb2.py → src/druncschema/description_pb2.py b/...or_dunedaq/druncschema/description_pb2.py → src/druncschema/description_pb2.py
diff --git a/...r_dunedaq/druncschema/description_pb2.pyi → src/druncschema/description_pb2.pyi b/...r_dunedaq/druncschema/description_pb2.pyi → src/druncschema/description_pb2.pyi
diff --git a/...nedaq/druncschema/description_pb2_grpc.py → src/druncschema/description_pb2_grpc.py b/...nedaq/druncschema/description_pb2_grpc.py → src/druncschema/description_pb2_grpc.py
diff --git a/...ot_for_dunedaq/druncschema/generic_pb2.py → src/druncschema/generic_pb2.py b/...ot_for_dunedaq/druncschema/generic_pb2.py → src/druncschema/generic_pb2.py
diff --git a/...t_for_dunedaq/druncschema/generic_pb2.pyi → src/druncschema/generic_pb2.pyi b/...t_for_dunedaq/druncschema/generic_pb2.pyi → src/druncschema/generic_pb2.pyi
diff --git a/...r_dunedaq/druncschema/generic_pb2_grpc.py → src/druncschema/generic_pb2_grpc.py b/...r_dunedaq/druncschema/generic_pb2_grpc.py → src/druncschema/generic_pb2_grpc.py
diff --git a/..._for_dunedaq/druncschema/opmon/FSM_pb2.py → src/druncschema/opmon/FSM_pb2.py b/..._for_dunedaq/druncschema/opmon/FSM_pb2.py → src/druncschema/opmon/FSM_pb2.py
diff --git a/...for_dunedaq/druncschema/opmon/FSM_pb2.pyi → src/druncschema/opmon/FSM_pb2.pyi b/...for_dunedaq/druncschema/opmon/FSM_pb2.pyi → src/druncschema/opmon/FSM_pb2.pyi
diff --git a/...dunedaq/druncschema/opmon/FSM_pb2_grpc.py → src/druncschema/opmon/FSM_pb2_grpc.py b/...dunedaq/druncschema/opmon/FSM_pb2_grpc.py → src/druncschema/opmon/FSM_pb2_grpc.py
diff --git a/...for_dunedaq/druncschema/opmon/__init__.py → src/druncschema/opmon/__init__.py b/...for_dunedaq/druncschema/opmon/__init__.py → src/druncschema/opmon/__init__.py
diff --git a/..._dunedaq/druncschema/opmon/generic_pb2.py → src/druncschema/opmon/generic_pb2.py b/..._dunedaq/druncschema/opmon/generic_pb2.py → src/druncschema/opmon/generic_pb2.py
diff --git a/...dunedaq/druncschema/opmon/generic_pb2.pyi → src/druncschema/opmon/generic_pb2.pyi b/...dunedaq/druncschema/opmon/generic_pb2.pyi → src/druncschema/opmon/generic_pb2.pyi
diff --git a/...daq/druncschema/opmon/generic_pb2_grpc.py → src/druncschema/opmon/generic_pb2_grpc.py b/...daq/druncschema/opmon/generic_pb2_grpc.py → src/druncschema/opmon/generic_pb2_grpc.py
diff --git a/.../druncschema/opmon/process_manager_pb2.py → src/druncschema/opmon/process_manager_pb2.py b/.../druncschema/opmon/process_manager_pb2.py → src/druncschema/opmon/process_manager_pb2.py
diff --git a/...druncschema/opmon/process_manager_pb2.pyi → ...druncschema/opmon/process_manager_pb2.pyi b/...druncschema/opmon/process_manager_pb2.pyi → ...druncschema/opmon/process_manager_pb2.pyi
diff --git a/...cschema/opmon/process_manager_pb2_grpc.py → ...cschema/opmon/process_manager_pb2_grpc.py b/...cschema/opmon/process_manager_pb2_grpc.py → ...cschema/opmon/process_manager_pb2_grpc.py
diff --git a/...unedaq/druncschema/process_manager_pb2.py → src/druncschema/process_manager_pb2.py b/...unedaq/druncschema/process_manager_pb2.py → src/druncschema/process_manager_pb2.py
diff --git a/...nedaq/druncschema/process_manager_pb2.pyi → src/druncschema/process_manager_pb2.pyi b/...nedaq/druncschema/process_manager_pb2.pyi → src/druncschema/process_manager_pb2.pyi
diff --git a/...q/druncschema/process_manager_pb2_grpc.py → src/druncschema/process_manager_pb2_grpc.py b/...q/druncschema/process_manager_pb2_grpc.py → src/druncschema/process_manager_pb2_grpc.py
diff --git a/python_not_for_dunedaq/druncschema/py.typed → src/druncschema/py.typed b/python_not_for_dunedaq/druncschema/py.typed → src/druncschema/py.typed
diff --git a/...nedaq/druncschema/request_response_pb2.py → src/druncschema/request_response_pb2.py b/...nedaq/druncschema/request_response_pb2.py → src/druncschema/request_response_pb2.py
diff --git a/...edaq/druncschema/request_response_pb2.pyi → src/druncschema/request_response_pb2.pyi b/...edaq/druncschema/request_response_pb2.pyi → src/druncschema/request_response_pb2.pyi
diff --git a/.../druncschema/request_response_pb2_grpc.py → src/druncschema/request_response_pb2_grpc.py b/.../druncschema/request_response_pb2_grpc.py → src/druncschema/request_response_pb2_grpc.py
diff --git a/...unedaq/druncschema/session_manager_pb2.py → src/druncschema/session_manager_pb2.py b/...unedaq/druncschema/session_manager_pb2.py → src/druncschema/session_manager_pb2.py
diff --git a/...nedaq/druncschema/session_manager_pb2.pyi → src/druncschema/session_manager_pb2.pyi b/...nedaq/druncschema/session_manager_pb2.pyi → src/druncschema/session_manager_pb2.pyi
diff --git a/...q/druncschema/session_manager_pb2_grpc.py → src/druncschema/session_manager_pb2_grpc.py b/...q/druncschema/session_manager_pb2_grpc.py → src/druncschema/session_manager_pb2_grpc.py
diff --git a/..._not_for_dunedaq/druncschema/token_pb2.py → src/druncschema/token_pb2.py b/..._not_for_dunedaq/druncschema/token_pb2.py → src/druncschema/token_pb2.py
diff --git a/...not_for_dunedaq/druncschema/token_pb2.pyi → src/druncschema/token_pb2.pyi b/...not_for_dunedaq/druncschema/token_pb2.pyi → src/druncschema/token_pb2.pyi
diff --git a/...for_dunedaq/druncschema/token_pb2_grpc.py → src/druncschema/token_pb2_grpc.py b/...for_dunedaq/druncschema/token_pb2_grpc.py → src/druncschema/token_pb2_grpc.py
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		# This directory is _NOT_ to be used for dune daq, this is solely when one wants to run standalone without any dunedaq dependency.
		__version__='0.11.3'