Skip to content

Commit 2f0ffc9

Browse files
Moved generate_json_map to new module (#226)
* Moved generate_json_map to new module * Modified tests for cli * modified test_main_jsnon_map_generation * Adding tests * Added nav tests * fixed linting * Update src/techui_builder/generate_jsonmap.py checking if techui defaults to value Co-authored-by: Ollie Copping <oliver.copping@diamond.ac.uk> * rebasing on typer cli changes * Fixed linting, changed help message * Removed entrypoint since the entry point can be accessed from main * patched _parse_display_names * small modification * added allow interspersed args in main_app.py * changed allow_interspersed location * Moved generate_json_map to new module --------- Co-authored-by: Ollie Copping <oliver.copping@diamond.ac.uk>
1 parent 2aed9a5 commit 2f0ffc9

12 files changed

Lines changed: 978 additions & 779 deletions

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ requires = ["setuptools>=64", "setuptools_scm[toml]>=8"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
6+
scripts = { techui-builder = "techui_builder.__main__:app" }
7+
68
name = "techui-builder"
79
dynamic = ["version"]
810
description = "A package for building Phoebus GUIs"
@@ -16,6 +18,7 @@ authors = [
1618
{ name = "Oliver Copping", email = "oliver.copping@diamond.ac.uk" },
1719
{ name = "Adedamola Sode", email = "adedamola.sode@diamond.ac.uk" },
1820
{ name = "Niamh Dougan", email = "niamh.dougan@diamond.ac.uk" },
21+
{ name = "Thomas Kane", email = "thomas.kane@diamond.ac.uk" },
1922
]
2023
license-files = ["LICENSE"]
2124
readme = "README.md"
@@ -30,8 +33,6 @@ dependencies = [
3033
"softioc>=4.7.0",
3134
"epicsdbbuilder>=1.5",
3235
]
33-
scripts = { techui-builder = "techui_builder.__main__:app" }
34-
3536
[dependency-groups]
3637
dev = [
3738
"copier",

src/techui_builder/__main__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
import typer
66

77
from techui_builder._version import __version__
8+
from techui_builder.generate_jsonmap import app as generate_jsonmap_app
89
from techui_builder.main_app import app as main_app
910
from techui_builder.schema_generator import app as schema_app
1011

1112
logger_ = logging.getLogger(__name__)
1213

1314
app = typer.Typer(
1415
pretty_exceptions_show_locals=False,
16+
context_settings={"allow_interspersed_args": True},
1517
help="""
1618
A script for building Phoebus GUIs.
1719
@@ -58,6 +60,7 @@ def _(
5860

5961
app.add_typer(main_app)
6062
app.add_typer(schema_app, name="schema")
63+
app.add_typer(generate_jsonmap_app, name="generate-jsonmap")
6164

6265

6366
if __name__ == "__main__":

src/techui_builder/autofill.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from lxml.etree import Element, SubElement, tostring
99
from lxml.objectify import ObjectifiedElement, fromstring
1010

11-
from techui_builder.builder import _get_action_group
11+
from techui_builder.generate_jsonmap import _get_action_group
1212
from techui_builder.models import Component
1313
from techui_builder.utils import read_bob
1414

0 commit comments

Comments
 (0)