diff --git a/pyproject.toml b/pyproject.toml index 02678d3..24e883d 100644 --- 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/python_not_for_dunedaq/druncschema/__init__.py b/src/druncschema/__init__.py similarity index 86% rename from python_not_for_dunedaq/druncschema/__init__.py rename to src/druncschema/__init__.py index 4d176e4..571ad55 100644 --- a/python_not_for_dunedaq/druncschema/__init__.py +++ b/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/python_not_for_dunedaq/druncschema/apps/__init__.py b/src/druncschema/apps/__init__.py similarity index 100% rename from python_not_for_dunedaq/druncschema/apps/__init__.py rename to src/druncschema/apps/__init__.py diff --git a/python_not_for_dunedaq/druncschema/apps/__main_generate_protos__.py b/src/druncschema/apps/__main_generate_protos__.py similarity index 100% rename from python_not_for_dunedaq/druncschema/apps/__main_generate_protos__.py rename to src/druncschema/apps/__main_generate_protos__.py diff --git a/python_not_for_dunedaq/druncschema/authoriser_pb2.py b/src/druncschema/authoriser_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/authoriser_pb2.py rename to src/druncschema/authoriser_pb2.py diff --git a/python_not_for_dunedaq/druncschema/authoriser_pb2.pyi b/src/druncschema/authoriser_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/authoriser_pb2.pyi rename to src/druncschema/authoriser_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/authoriser_pb2_grpc.py b/src/druncschema/authoriser_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/authoriser_pb2_grpc.py rename to src/druncschema/authoriser_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/broadcast_pb2.py b/src/druncschema/broadcast_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/broadcast_pb2.py rename to src/druncschema/broadcast_pb2.py diff --git a/python_not_for_dunedaq/druncschema/broadcast_pb2.pyi b/src/druncschema/broadcast_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/broadcast_pb2.pyi rename to src/druncschema/broadcast_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/broadcast_pb2_grpc.py b/src/druncschema/broadcast_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/broadcast_pb2_grpc.py rename to src/druncschema/broadcast_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.py b/src/druncschema/controller_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/controller_pb2.py rename to src/druncschema/controller_pb2.py diff --git a/python_not_for_dunedaq/druncschema/controller_pb2.pyi b/src/druncschema/controller_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/controller_pb2.pyi rename to src/druncschema/controller_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/controller_pb2_grpc.py b/src/druncschema/controller_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/controller_pb2_grpc.py rename to src/druncschema/controller_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/description_pb2.py b/src/druncschema/description_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/description_pb2.py rename to src/druncschema/description_pb2.py diff --git a/python_not_for_dunedaq/druncschema/description_pb2.pyi b/src/druncschema/description_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/description_pb2.pyi rename to src/druncschema/description_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/description_pb2_grpc.py b/src/druncschema/description_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/description_pb2_grpc.py rename to src/druncschema/description_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/generic_pb2.py b/src/druncschema/generic_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/generic_pb2.py rename to src/druncschema/generic_pb2.py diff --git a/python_not_for_dunedaq/druncschema/generic_pb2.pyi b/src/druncschema/generic_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/generic_pb2.pyi rename to src/druncschema/generic_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/generic_pb2_grpc.py b/src/druncschema/generic_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/generic_pb2_grpc.py rename to src/druncschema/generic_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/opmon/FSM_pb2.py b/src/druncschema/opmon/FSM_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/FSM_pb2.py rename to src/druncschema/opmon/FSM_pb2.py diff --git a/python_not_for_dunedaq/druncschema/opmon/FSM_pb2.pyi b/src/druncschema/opmon/FSM_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/FSM_pb2.pyi rename to src/druncschema/opmon/FSM_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/opmon/FSM_pb2_grpc.py b/src/druncschema/opmon/FSM_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/FSM_pb2_grpc.py rename to src/druncschema/opmon/FSM_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/opmon/__init__.py b/src/druncschema/opmon/__init__.py similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/__init__.py rename to src/druncschema/opmon/__init__.py diff --git a/python_not_for_dunedaq/druncschema/opmon/generic_pb2.py b/src/druncschema/opmon/generic_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/generic_pb2.py rename to src/druncschema/opmon/generic_pb2.py diff --git a/python_not_for_dunedaq/druncschema/opmon/generic_pb2.pyi b/src/druncschema/opmon/generic_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/generic_pb2.pyi rename to src/druncschema/opmon/generic_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/opmon/generic_pb2_grpc.py b/src/druncschema/opmon/generic_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/generic_pb2_grpc.py rename to src/druncschema/opmon/generic_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/opmon/process_manager_pb2.py b/src/druncschema/opmon/process_manager_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/process_manager_pb2.py rename to src/druncschema/opmon/process_manager_pb2.py diff --git a/python_not_for_dunedaq/druncschema/opmon/process_manager_pb2.pyi b/src/druncschema/opmon/process_manager_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/process_manager_pb2.pyi rename to src/druncschema/opmon/process_manager_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/opmon/process_manager_pb2_grpc.py b/src/druncschema/opmon/process_manager_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/opmon/process_manager_pb2_grpc.py rename to src/druncschema/opmon/process_manager_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.py b/src/druncschema/process_manager_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/process_manager_pb2.py rename to src/druncschema/process_manager_pb2.py diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2.pyi b/src/druncschema/process_manager_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/process_manager_pb2.pyi rename to src/druncschema/process_manager_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py b/src/druncschema/process_manager_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/process_manager_pb2_grpc.py rename to src/druncschema/process_manager_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/py.typed b/src/druncschema/py.typed similarity index 100% rename from python_not_for_dunedaq/druncschema/py.typed rename to src/druncschema/py.typed diff --git a/python_not_for_dunedaq/druncschema/request_response_pb2.py b/src/druncschema/request_response_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/request_response_pb2.py rename to src/druncschema/request_response_pb2.py diff --git a/python_not_for_dunedaq/druncschema/request_response_pb2.pyi b/src/druncschema/request_response_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/request_response_pb2.pyi rename to src/druncschema/request_response_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/request_response_pb2_grpc.py b/src/druncschema/request_response_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/request_response_pb2_grpc.py rename to src/druncschema/request_response_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/session_manager_pb2.py b/src/druncschema/session_manager_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/session_manager_pb2.py rename to src/druncschema/session_manager_pb2.py diff --git a/python_not_for_dunedaq/druncschema/session_manager_pb2.pyi b/src/druncschema/session_manager_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/session_manager_pb2.pyi rename to src/druncschema/session_manager_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py b/src/druncschema/session_manager_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/session_manager_pb2_grpc.py rename to src/druncschema/session_manager_pb2_grpc.py diff --git a/python_not_for_dunedaq/druncschema/token_pb2.py b/src/druncschema/token_pb2.py similarity index 100% rename from python_not_for_dunedaq/druncschema/token_pb2.py rename to src/druncschema/token_pb2.py diff --git a/python_not_for_dunedaq/druncschema/token_pb2.pyi b/src/druncschema/token_pb2.pyi similarity index 100% rename from python_not_for_dunedaq/druncschema/token_pb2.pyi rename to src/druncschema/token_pb2.pyi diff --git a/python_not_for_dunedaq/druncschema/token_pb2_grpc.py b/src/druncschema/token_pb2_grpc.py similarity index 100% rename from python_not_for_dunedaq/druncschema/token_pb2_grpc.py rename to src/druncschema/token_pb2_grpc.py