cgse 0.13.0__tar.gz → 0.13.1__tar.gz

{cgse-0.13.0 → cgse-0.13.1}/.gitignore

@@ -18,6 +18,7 @@ dist
 
 .pytest_cache
 .coverage
+.coverage.*
 .nox
 htmlcov
 

{cgse-0.13.0 → cgse-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cgse
-Version: 0.13.0
+Version: 0.13.1
 Summary: Generic Common-EGSE: Commanding and monitoring lab equipment
 Author: IvS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>

{cgse-0.13.0 → cgse-0.13.1}/docs/roadmap.md

@@ -67,7 +67,8 @@ Provide a `cgse` command that is extensible with new commands and command groups
   use of command YAML files, replace `dynamic_interface` with `dynamic_command`.
 - [ ] Introduce asyncio into the commanding protocol, e.g. `get_status()` 
   and `get_housekeeping()` shall be handled asynchronously.
-- [ ] GlobalState Setup needs some redesign, especially `GlobalState.setup` which should not consult
+- [x] GlobalState Setup needs some redesign, especially `GlobalState.setup` 
+  which should not consult
   the configuration manager by default.
 
 ## Removals

{cgse-0.13.0 → cgse-0.13.1}/justfile

@@ -25,7 +25,7 @@ hello arg="":
 system-info:
   @echo "This is an {{arch()}} machine, running {{os()}}".
 
-default_python := "3.9.20"
+default_python := "3.10"
 
 # Start an IPython session
 ipython version=default_python:

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-common/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-common"
-version = "0.13.0"
+version = "0.13.1"
 description = "Software framework to support hardware testing"
 authors = [
     {name = "IvS KU Leuven"}
@@ -19,7 +19,7 @@ keywords = [
     "software framework"
 ]
 dependencies = [
-    "click>=8.1.8",
+    "click>=8.2.1",
     "deepdiff>=8.1.1",
     "distro>=1.9.0",
     "gitpython>=3.1.44",
@@ -27,7 +27,7 @@ dependencies = [
     "psutil>=6.1.1",
     "pyyaml>=6.0.2",
     "rich>=13.9.4",
-    "typer>=0.15.1",
+    "typer>=0.16.0",
     "navdict>=0.5.9",
     # Python 3.9 specific dependencies
     "numpy==1.26.4; python_version == '3.9'",
@@ -58,7 +58,7 @@ cgse-common = "cgse_common:settings.yaml"
 [tool.pytest.ini_options]
 pythonpath = "src"
 testpaths = ["tests"]
-addopts = "-rA --cov --cov-branch --cov-report html"
+addopts = "-ra --cov --cov-branch --cov-report html"
 log_cli = true
 log_cli_level = "INFO"
 filterwarnings = [

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-common/src/cgse_common/cgse.py

@@ -85,7 +85,7 @@ class SortedCommandGroup(TyperGroup):
         return sorted(commands, key=get_command_priority)
 
 
-app = typer.Typer(add_completion=True, cls=SortedCommandGroup, rich_markup_mode="markdown")
+app = typer.Typer(add_completion=True, cls=SortedCommandGroup)
 
 
 @app.command()
@@ -121,22 +121,33 @@ def version(ctx: typer.Context):
             )
 
 
+def subcommand_callback(ctx: typer.Context):
+    """Normal callback."""
+    if ctx.invoked_subcommand is None:
+        typer.echo("No command specified:")
+        typer.echo(ctx.get_help())
+        raise typer.Exit()
+
+
 def build_app():
     global app
 
+    # rich.print("Available command groups:", entry_points("cgse.command"))
+
     for ep in entry_points("cgse.command"):
         try:
             obj = ep.load()
             if isinstance(obj, typer.Typer):
-                app.add_typer(ep.load(), name=ep.name)
+                obj.callback(invoke_without_command=True)(subcommand_callback)
+                app.add_typer(obj, name=ep.name)
             else:
-                app.command()(ep.load())
+                app.command()(obj)
         except Exception as exc:
             app.command()(broken_command(ep.name, ep.module, exc))
 
     cgse_eps = HierarchicalEntryPoints("cgse.service")
 
-    # rich.print("Available groups:", cgse_eps.get_all_groups())
+    # rich.print("Available services groups:", cgse_eps.get_all_groups())
 
     for group in cgse_eps.get_all_groups():
         for ep in entry_points(group):
@@ -145,12 +156,14 @@ def build_app():
                     app.add_typer(ep.load(), name=ep.name)
                 else:
                     command_group = snake_to_title(group.split(".")[-1])
-                    app.add_typer(ep.load(), name=ep.name, rich_help_panel=command_group)
+                    plugin_app: typer.Typer = ep.load()
+                    plugin_app.callback(invoke_without_command=True)(subcommand_callback)
+                    app.add_typer(plugin_app, name=ep.name, rich_help_panel=command_group)
             except Exception as exc:
                 app.command()(broken_command(ep.name, ep.module, exc))
 
 
-@app.callback(no_args_is_help=True, invoke_without_command=True)
+@app.callback(invoke_without_command=True)
 def main(ctx: typer.Context, verbose: bool = False):
     """
     The `cgse` command is used to:
@@ -167,6 +180,9 @@ def main(ctx: typer.Context, verbose: bool = False):
 
     ctx.obj = AppState(verbose=verbose)
 
+    if ctx.invoked_subcommand is None:
+        # print("Try 'cgse --help' for a list of commands.")
+        typer.echo(ctx.get_help())
 
 build_app()
 

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-coordinates/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-coordinates"
-version = "0.13.0"
+version = "0.13.1"
 description = "Reference Frames and Coordinate Transofrmations for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-core/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-core"
-version = "0.13.0"
+version = "0.13.1"
 description = "Core services for the CGSE framework"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-core/src/cgse_core/services.py

@@ -30,7 +30,6 @@ from ._stop import stop_sm_cs
 core = typer.Typer(
     name="core",
     help="handle core services: start, stop, status, re-register",
-    no_args_is_help=True,
 )
 
 
@@ -92,7 +91,6 @@ def core_reregister(force: bool = False):
 rm_cs = typer.Typer(
     name="rm_cs",
     help="handle registry services: start, stop, status, list-services",
-    no_args_is_help=True,
 )
 
 
@@ -126,7 +124,6 @@ async def reg_list_services():
 log_cs = typer.Typer(
     name="log_cs",
     help="handle log services: start, stop, status, re-register",
-    no_args_is_help=True,
 )
 
 
@@ -164,7 +161,6 @@ def log_cs_reregister(force: bool = False):
 cm_cs = typer.Typer(
     name="cm_cs",
     help="handle configuration manager: start, stop, status, re-register",
-    no_args_is_help=True,
 )
 
 
@@ -209,7 +205,6 @@ def cm_cs_register_to_storage():
 sm_cs = typer.Typer(
     name="sm_cs",
     help="handle storage manager: start, stop, status, re-register",
-    no_args_is_help=True,
 )
 
 
@@ -247,7 +242,6 @@ def sm_cs_reregister(force: bool = False):
 pm_cs = typer.Typer(
     name="pm_cs",
     help="handle process manager: start, stop, status, re-register",
-    no_args_is_help=True,
 )
 
 

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-core/src/egse/confman/confman_cs.py

@@ -122,7 +122,7 @@ class ConfigurationManagerControlServer(ControlServer):
 
 
 app_name = "cm_cs"
-app = typer.Typer(name=app_name, no_args_is_help=True)
+app = typer.Typer(name=app_name)
 
 
 @app.command()

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-core/src/egse/logger/log_cs.py

@@ -92,7 +92,7 @@ class DateTimeFormatter(logging.Formatter):
 file_formatter = DateTimeFormatter(fmt=LOG_FORMAT_KEY_VALUE, datefmt=LOG_FORMAT_DATE)
 
 app_name = "log_cs"
-app = typer.Typer(name=app_name, no_args_is_help=True)
+app = typer.Typer(name=app_name)
 
 
 @app.command()

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-core/src/egse/procman/procman_cs.py

@@ -115,7 +115,7 @@ class ProcessManagerControlServer(ControlServer):
 
 
 app_name = "pm_cs"
-app = typer.Typer(name=app_name, no_args_is_help=True)
+app = typer.Typer(name=app_name)
 
 
 @app.command()

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-core/src/egse/registry/server.py

@@ -34,7 +34,7 @@ from egse.registry.client import AsyncRegistryClient
 from egse.system import TyperAsyncCommand
 from egse.system import get_logging_level
 
-app = typer.Typer(name="rs_cs", no_args_is_help=True)
+app = typer.Typer(name="rs_cs")
 
 
 class AsyncRegistryServer:

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-core/src/egse/storage/storage_cs.py

@@ -103,7 +103,7 @@ class StorageControlServer(ControlServer):
 
 
 app_name = "sm_cs"
-app = typer.Typer(name=app_name, no_args_is_help=True)
+app = typer.Typer(name=app_name)
 
 
 @app.command()

{cgse-0.13.0 → cgse-0.13.1}/libs/cgse-gui/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-gui"
-version = "0.13.0"
+version = "0.13.1"
 description = "GUI components for CGSE"
 authors = [
     {name = "Rik Huygen", email = "rik.huygen@kuleuven.be"},

{cgse-0.13.0 → cgse-0.13.1}/noxfile.py

@@ -1,6 +1,6 @@
 import nox
 
-python_versions = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+python_versions = ["3.10", "3.11", "3.12", "3.13"]
 
 
 # Define monorepo-wide sessions

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/cgse-tools/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse-tools"
-version = "0.13.0"
+version = "0.13.1"
 description = "Tools for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/cgse-tools/src/cgse_tools/cgse_commands.py

@@ -129,7 +129,7 @@ def init(project: str = ""):
         )
 
 
-show = typer.Typer(help="Show information about settings, environment, setup, ...", no_args_is_help=True)
+show = typer.Typer(help="Show information about settings, environment, setup, ...")
 
 
 @show.command(name="settings")
@@ -255,7 +255,7 @@ def show_setup(
             rich.print("[red]No setup files were found.[/]")
 
 
-check = typer.Typer(help="Check installation, settings, required files, etc.", no_args_is_help=True)
+check = typer.Typer(help="Check installation, settings, required files, etc.")
 
 
 @check.command(name="setups")

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/cgse-tools/src/cgse_tools/cgse_services.py

@@ -4,7 +4,7 @@ import rich
 import typer
 
 dev_x = typer.Typer(
-    name="dev-x", help="device-x is an imaginary device that serves as an example", no_args_is_help=True
+    name="dev-x", help="device-x is an imaginary device that serves as an example",
 )
 
 

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/keithley-tempcontrol/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "keithley-tempcontrol"
-version = "0.13.0"
+version = "0.13.1"
 description = "Keithley Temperature Control for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/keithley-tempcontrol/src/egse/tempcontrol/keithley/daq6510_cs.py

@@ -145,7 +145,7 @@ class DAQ6510ControlServer(ControlServer):
         start_http_server(CTRL_SETTINGS.METRICS_PORT)
 
 
-app = typer.Typer(name="daq6510_cs", no_args_is_help=True)
+app = typer.Typer(name="daq6510_cs")
 
 
 @app.command()

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/keithley-tempcontrol/src/keithley_tempcontrol/cgse_services.py

@@ -7,9 +7,7 @@ from pathlib import Path
 import rich
 import typer
 
-daq6510 = typer.Typer(
-    name="daq6510", help="DAQ6510 Data Acquisition Unit, Keithley, temperature monitoring", no_args_is_help=True
-)
+daq6510 = typer.Typer(name="daq6510", help="DAQ6510 Data Acquisition Unit, Keithley, temperature monitoring")
 
 
 @daq6510.command(name="start")

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/lakeshore-tempcontrol/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lakeshore-tempcontrol"
-version = "0.13.0"
+version = "0.13.1"
 description = "Lakeshore Temperature Control for CGSE"
 authors = [
     {name = "IVS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/lakeshore-tempcontrol/src/lakeshore_tempcontrol/cgse_services.py

@@ -12,7 +12,6 @@ from egse.env import get_log_file_location
 lakeshore336 = typer.Typer(
     name="LakeShore336",
     help="LakeShore336 Data Acquisition Unit, LakeShore, temperature monitoring",
-    no_args_is_help=True,
 )
 
 

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/symetrie-hexapod/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "symetrie-hexapod"
-version = "0.13.0"
+version = "0.13.1"
 description = "Symetrie Hexapod implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/projects/generic/symetrie-hexapod/src/symetrie_hexapod/cgse_services.py

@@ -11,11 +11,11 @@ import typer
 from egse.env import get_log_file_location
 from egse.system import all_logging_disabled
 
-puna = typer.Typer(name="puna", help="PUNA Positioning Hexapod, Symétrie", no_args_is_help=True)
+puna = typer.Typer(name="puna", help="PUNA Positioning Hexapod, Symétrie")
 
-zonda = typer.Typer(name="zonda", help="ZONDA Positioning Hexapod, Symétrie", no_args_is_help=True)
+zonda = typer.Typer(name="zonda", help="ZONDA Positioning Hexapod, Symétrie")
 
-joran = typer.Typer(name="joran", help="JORAN Positioning Hexapod, Symétrie", no_args_is_help=True)
+joran = typer.Typer(name="joran", help="JORAN Positioning Hexapod, Symétrie")
 
 
 def redirect_output_to(output_fn: str) -> TextIO:

{cgse-0.13.0 → cgse-0.13.1}/projects/plato/plato-fits/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-fits"
-version = "0.13.0"
+version = "0.13.1"
 description = "FITS Persistence implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/projects/plato/plato-hdf5/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-hdf5"
-version = "0.13.0"
+version = "0.13.1"
 description = "HDF5 Persistence sub-class for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/projects/plato/plato-spw/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plato-spw"
-version = "0.13.0"
+version = "0.13.1"
 description = "SpaceWire implementation for CGSE"
 authors = [
     {name = "IvS KU Leuven"}

{cgse-0.13.0 → cgse-0.13.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cgse"
-version = "0.13.0"
+version = "0.13.1"
 description = "Generic Common-EGSE: Commanding and monitoring lab equipment"
 authors = [
     {name = "IvS KU Leuven"}
@@ -78,13 +78,13 @@ build-backend = "hatchling.build"
 
 [dependency-groups]
 dev = [
-    "setuptools",  # needed by PyCharm
+    "setuptools", # needed by PyCharm
     "pytest>=8.3.4",
     "pytest-cov>=6.0.0",
     "pytest-mock>=3.14.0",
-    "ruff>=0.9.0",
+    "ruff>=0.12.8",
     "nox",
-    "setuptools>=75.8.2",  # needed by PyCharm
+    "setuptools>=75.8.2", # needed by PyCharm
 ]
 docs = [
     "mkdocs",

{cgse-0.13.0 → cgse-0.13.1}/ruff.toml

@@ -21,5 +21,5 @@ exclude = [
 line-length = 120
 indent-width = 4
 
-# Assume Python 3.9
-target-version = "py39"
+# Assume Python 3.10
+target-version = "py310"

cgse-0.13.0/TODO.md

@@ -1,3 +0,0 @@
-# TODO
-
-* [x] we will use one global version for the monorepo -> create a bump script that updates all version numbers from the master pyproject.toml