From c65e62bcd03ff2313aae62008e9c68a1d896f581 Mon Sep 17 00:00:00 2001 From: "Sode, Adedamola (DLSLtd,RAL,LSCI)" Date: Fri, 7 Feb 2025 14:18:13 +0000 Subject: [PATCH 1/2] Submodules: created branch with required submodules to match gui_map.yaml and ioc.yaml --- .gitmodules | 7 +++++++ blgui | 1 + p47-services | 1 + src/phoebus_guibuilder/guibuilder.py | 4 ++-- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 blgui create mode 160000 p47-services diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..0be246e9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,7 @@ +[submodule "blgui"] + path = blgui + url = git@gitlab.diamond.ac.uk:controls/support/blgui.git + branch = BLGuiYaml +[submodule "p47-services"] + path = p47-services + url = https://github.com/epics-containers/p47-services.git diff --git a/blgui b/blgui new file mode 160000 index 00000000..4eac6444 --- /dev/null +++ b/blgui @@ -0,0 +1 @@ +Subproject commit 4eac6444e110cd60aaaee3b51453ec8cb0bbb9fd diff --git a/p47-services b/p47-services new file mode 160000 index 00000000..f4bf3a6d --- /dev/null +++ b/p47-services @@ -0,0 +1 @@ +Subproject commit f4bf3a6d315061cc6a5289a17a0fc64b529b2f0c diff --git a/src/phoebus_guibuilder/guibuilder.py b/src/phoebus_guibuilder/guibuilder.py index fa77b8c8..7f831a34 100644 --- a/src/phoebus_guibuilder/guibuilder.py +++ b/src/phoebus_guibuilder/guibuilder.py @@ -105,7 +105,7 @@ def find_services_folders(): services_directory = ( beamline.dom + "-services/services" ) # TODO: rm hardcoding, map to services. - path = f"/dls/science/users/uns32131/{services_directory}" + path = f"{services_directory}" files = os.listdir(path) # Attempting to match the prefix to the files in the services directory @@ -145,7 +145,7 @@ def extract_valid_entities(ioc_yaml: str, component: Component): def gui_map(entrys: list[Entry]): - gui_map = "/dls/science/users/uns32131/BLGui/BLGuiApp/opi/bob/gui_map.yaml" + gui_map = "blgui/BLGuiApp/opi/bob/gui_map.yaml" with open(gui_map) as map: conf = yaml.safe_load(map) From c4834667a3dbd438bde91d9eae66f1bcf1bd7779 Mon Sep 17 00:00:00 2001 From: "Sode, Adedamola (DLSLtd,RAL,LSCI)" Date: Fri, 7 Feb 2025 15:04:18 +0000 Subject: [PATCH 2/2] Submodules: created branch with required submodules to match gui_map.yaml and ioc.yaml --- .github/workflows/_container.yml | 1 + .github/workflows/_test.yml | 1 + .github/workflows/_tox.yml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_container.yml b/.github/workflows/_container.yml index da5e4936..4a02677d 100644 --- a/.github/workflows/_container.yml +++ b/.github/workflows/_container.yml @@ -10,6 +10,7 @@ jobs: uses: actions/checkout@v4 with: # Need this to get version number from last tag + submodules: recursive fetch-depth: 0 - name: Set up Docker Buildx diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index f652d414..98b20620 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -26,6 +26,7 @@ jobs: uses: actions/checkout@v4 with: # Need this to get version number from last tag + submodules: recursive fetch-depth: 0 - if: inputs.python-version == 'dev' diff --git a/.github/workflows/_tox.yml b/.github/workflows/_tox.yml index a13536d3..d6ae245d 100644 --- a/.github/workflows/_tox.yml +++ b/.github/workflows/_tox.yml @@ -6,7 +6,6 @@ on: description: What to run under tox required: true - jobs: run: runs-on: "ubuntu-latest" @@ -14,6 +13,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + submodules: recursive - name: Install python packages uses: ./.github/actions/install_requirements