lint, new devops

DiamondLightSource · Feb 24, 2023 · 54e43fa · 54e43fa
1 parent a370fb7
commit 54e43fa
Show file tree

Hide file tree

Showing 27 changed files with 50 additions and 54 deletions.
diff --git a/.dae-devops/Makefile b/.dae-devops/Makefile
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 # ---------------------------------------------------------------------
@@ -69,4 +69,4 @@ publish_docs:
 	cp -r build/html/* $(DOCS_PUBLISH_ROOT)
 
 
-# dae_devops_fingerprint 996f6b1ef802af210a1d22ed5daf99c3
+# dae_devops_fingerprint 37cc3e10ff97563262222c305ac66166
diff --git a/.dae-devops/docs/conventions.rst b/.dae-devops/docs/conventions.rst
@@ -1,5 +1,5 @@
 .. # ********** Please don't edit this file!
-.. # ********** It has been generated automatically by dae_devops version 0.5.1.
+.. # ********** It has been generated automatically by dae_devops version 0.5.2.
 .. # ********** For repository_name xchembku
 
 Naming conventions
@@ -31,4 +31,4 @@ repository
     lowercase, hyphens
 
 
-.. # dae_devops_fingerprint 25439a6a1ddc65a5961748c0c130054b
+.. # dae_devops_fingerprint 62f9350a2bf32c116db81f845c721f6f
diff --git a/.dae-devops/docs/developing.rst b/.dae-devops/docs/developing.rst
@@ -1,5 +1,5 @@
 .. # ********** Please don't edit this file!
-.. # ********** It has been generated automatically by dae_devops version 0.5.1.
+.. # ********** It has been generated automatically by dae_devops version 0.5.2.
 .. # ********** For repository_name xchembku
 
 Developing
@@ -36,4 +36,4 @@ If you plan to modify the docs, you will need to::
     
 
 
-.. # dae_devops_fingerprint 2ebf170fbef6d49e7725feaefcd5caa5
+.. # dae_devops_fingerprint e7e76b1a5311ccf929167c787da25eca
diff --git a/.dae-devops/docs/devops.rst b/.dae-devops/docs/devops.rst
@@ -1,5 +1,5 @@
 .. # ********** Please don't edit this file!
-.. # ********** It has been generated automatically by dae_devops version 0.5.1.
+.. # ********** It has been generated automatically by dae_devops version 0.5.2.
 .. # ********** For repository_name xchembku
 
 Devops
@@ -43,4 +43,4 @@ Publishing::
     
 
 
-.. # dae_devops_fingerprint 076be73dea1625dcc794c3c79dceaa36
+.. # dae_devops_fingerprint 5046f56ff14b58d97e9d1ae6c461f519
diff --git a/.dae-devops/docs/docs_structure.rst b/.dae-devops/docs/docs_structure.rst
@@ -1,5 +1,5 @@
 .. # ********** Please don't edit this file!
-.. # ********** It has been generated automatically by dae_devops version 0.5.1.
+.. # ********** It has been generated automatically by dae_devops version 0.5.2.
 .. # ********** For repository_name xchembku
 
 About the documentation
@@ -21,4 +21,4 @@ improve most documentation - often immensely.
 
 `More information on this topic. <https://documentation.divio.com>`_
 
-.. # dae_devops_fingerprint f7a41a3f8cef31f5d507747405e118c7
+.. # dae_devops_fingerprint 3991a961381331fb710f03dd96c3db0d
diff --git a/.dae-devops/docs/installing.rst b/.dae-devops/docs/installing.rst
@@ -1,5 +1,5 @@
 .. # ********** Please don't edit this file!
-.. # ********** It has been generated automatically by dae_devops version 0.5.1.
+.. # ********** It has been generated automatically by dae_devops version 0.5.2.
 .. # ********** For repository_name xchembku
 
 Installing
@@ -40,4 +40,4 @@ You can check the version that has been installed by typing::
     $ xchembku --version
     $ xchembku --version-json
 
-.. # dae_devops_fingerprint 2d13700967f6e58ff8ab801a6991c4ad
+.. # dae_devops_fingerprint e0afdddf0067db56b8f017a8b41f6d5e
diff --git a/.dae-devops/docs/testing.rst b/.dae-devops/docs/testing.rst
@@ -1,5 +1,5 @@
 .. # ********** Please don't edit this file!
-.. # ********** It has been generated automatically by dae_devops version 0.5.1.
+.. # ********** It has been generated automatically by dae_devops version 0.5.2.
 .. # ********** For repository_name xchembku
 
 Testing
@@ -35,4 +35,4 @@ This allows peeking in there to see what's been written by the test.
 
 
 
-.. # dae_devops_fingerprint 1321c977458dd9c096f643c190b585ca
+.. # dae_devops_fingerprint 0280ed9bb4b4f7b5eeb335a405be618b
diff --git a/.dae-devops/prepare_git_dependencies.sh b/.dae-devops/prepare_git_dependencies.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 me=${BASH_SOURCE}
@@ -13,4 +13,4 @@ function __install {
 }
 
 
-# dae_devops_fingerprint afcb4bfc6594dce12189c5df4171afac
+# dae_devops_fingerprint e0ae8f2ac0e475defc383c2fc1c4507a
diff --git a/.dae-devops/project.yaml b/.dae-devops/project.yaml
@@ -16,4 +16,5 @@ primary:
           list:
               - dls_servbase
               - dls_mainiac
+              - dls_multiconf
               - dls_utilpack
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 # This file is for use as a devcontainer and a runtime container
@@ -40,4 +40,4 @@ ENV PATH=/venv/bin:$PATH
 ENTRYPOINT ["xchembku"]
 CMD ["--version"]
 
-# dae_devops_fingerprint 6523379245c65d34f97a24e805cbeefb
+# dae_devops_fingerprint 680468bdc2c14f847ee259257ae283d9
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 // ********** Please don't edit this file!
-// ********** It has been generated automatically by dae_devops version 0.5.1.
+// ********** It has been generated automatically by dae_devops version 0.5.2.
 // ********** For repository_name xchembku
 
 // For format details, see https://containers.dev/implementors/json_reference/
@@ -57,4 +57,4 @@
     "postCreateCommand": "pip install -e .[dev]"
 }
 
-// dae_devops_fingerprint d35fb564a3058445fd4c4958e20c2052
+// dae_devops_fingerprint da0893109849a1c2b1e58165a9acf775
diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst
@@ -1,5 +1,5 @@
 .. # ********** Please don't edit this file!
-.. # ********** It has been generated automatically by dae_devops version 0.5.1.
+.. # ********** It has been generated automatically by dae_devops version 0.5.2.
 .. # ********** For repository_name xchembku
 
 Contributing to the project
@@ -38,4 +38,4 @@ should follow.
 
 .. _Developer Guide: https://diamondlightsource.github.io/xchembku/main/developer/how-to/contribute.html
 
-.. # dae_devops_fingerprint ccf26c67a299599d9af61bcb4bc65f58
+.. # dae_devops_fingerprint 18a2f4bee481cbbd9336ca4eb826d663
diff --git a/.github/actions/install_requirements/action.yml b/.github/actions/install_requirements/action.yml
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 name: Install requirements
@@ -61,4 +61,4 @@ runs:
       shell: bash
 
 
-# dae_devops_fingerprint 6a623ad9fbf1fa99b5e41c63ee441412
+# dae_devops_fingerprint 74117c18d48c5251cb9bcb8339f3a5d6
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 # To get started with Dependabot version updates, you'll need to specify which
@@ -19,4 +19,4 @@ updates:
     schedule:
       interval: "weekly"
 
-# dae_devops_fingerprint 14ad6fa3f346d875adcb9466300bdd7d
+# dae_devops_fingerprint 35a240f5b9435f88aebb3cc5d4d8f23f
diff --git a/.github/pages/index.html b/.github/pages/index.html
@@ -1,5 +1,5 @@
 <!-- ********** Please don't edit this file! -->
-<!-- ********** It has been generated automatically by dae_devops version 0.5.1. -->
+<!-- ********** It has been generated automatically by dae_devops version 0.5.2. -->
 <!-- ********** For repository_name xchembku -->
 
 <!DOCTYPE html>
@@ -14,4 +14,4 @@
 
 </html>
 
-<!-- dae_devops_fingerprint 8c36432f0e4b4a03c44ea0f93f14aa41 -->
+<!-- dae_devops_fingerprint 3abd0582434786e160a080b68b7423b8 -->
diff --git a/.github/pages/make_switcher.py b/.github/pages/make_switcher.py
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 import json
@@ -102,4 +102,4 @@ def main(args=None):
 if __name__ == "__main__":
     main()
 
-# dae_devops_fingerprint 7e236abbc517fac101fa147cb851bc32
+# dae_devops_fingerprint 6617b998da1ca2e997a558711603f920
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 name: Code CI
@@ -212,4 +212,4 @@ jobs:
         with:
           password: ${{ secrets.PYPI_TOKEN }}
 
-# dae_devops_fingerprint 244fd155ba1e014f2b929c0933b3a087
+# dae_devops_fingerprint bb3f1f5853bc4dae6aee2b49904ee5f0
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 name: Docs CI
@@ -56,4 +56,4 @@ jobs:
           publish_dir: .github/pages
           keep_files: true
 
-# dae_devops_fingerprint bea81feec5d69d0d8bf22af967fa9e68
+# dae_devops_fingerprint 90ddc5e712aa6cbe77be2950f77400f8
diff --git a/.github/workflows/docs_clean.yml b/.github/workflows/docs_clean.yml
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 name: Docs Cleanup CI
@@ -46,4 +46,4 @@ jobs:
           git commit -am "Removing redundant docs version $DOCS_VERSION"
           git push
 
-# dae_devops_fingerprint bca9c2af3af38c52416b4563392d5741
+# dae_devops_fingerprint 265968f295372c9fce9a5dcd7a5d61c2
diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 name: Link Check
@@ -27,4 +27,4 @@ jobs:
       - name: Check links
         run: tox -e docs build -- -b linkcheck
 
-# dae_devops_fingerprint e5064903e82a363eee1e5aa3774f3e79
+# dae_devops_fingerprint a6fb2885c8e8a2fd68b602f0deeccba1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 variables:
@@ -87,4 +87,4 @@ package_pip:
 #     # The validate_docs artifacts are in the build/html folder.
 #     - make -f .dae-devops/Makefile publish_docs
 
-# dae_devops_fingerprint d717b80dcfb3c7bcb10347154cf6b1a6
+# dae_devops_fingerprint 598c15acbaf37390bde200720e3166a3
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
@@ -1,5 +1,5 @@
 /* ********** Please don't edit this file! */ 
-/* ********** It has been generated automatically by dae_devops version 0.5.1. */ 
+/* ********** It has been generated automatically by dae_devops version 0.5.2. */ 
 /* ********** For repository_name xchembku */ 
 
 /* The theme normally has this, but I think it's ok to use the full width of the window in all @media sizes.
@@ -15,4 +15,4 @@
     max-width: 100%;
 }
 
-/* dae_devops_fingerprint 0beb720a2ff05d0f82a29bc3d1781ebd */ 
+/* dae_devops_fingerprint fcc3d7bfab63b48c50a66fcc4d4b9fd2 */ 
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 from pathlib import Path
@@ -197,4 +197,4 @@ def setup(app):
     app.connect("source-read", ultimateReplace)
 
 
-# dae_devops_fingerprint e37b41308750589576eeeb1ce58f126e
+# dae_devops_fingerprint 84c433c63efba1181dae7d798737f15d
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 # ********** Please don't edit this file!
-# ********** It has been generated automatically by dae_devops version 0.5.1.
+# ********** It has been generated automatically by dae_devops version 0.5.2.
 # ********** For repository_name xchembku
 
 [build-system]
@@ -16,7 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
 ]
 description = "XChem Business Knowledge Unit. Service, Client, API, persistent store."
-dependencies = ["dls_servbase", "dls_mainiac", "dls_utilpack"]
+dependencies = ["dls_servbase", "dls_mainiac", "dls_multiconf", "dls_utilpack"]
 dynamic = ["version"]
 license.file = "LICENSE"
 readme = "README.rst"
@@ -34,6 +34,7 @@ dev = [
     "pydocstyle[toml]",
     "tox-direct",
     "types-mock",
+    "types-PyYAML",
 ]
 docs = [
     "pydata-sphinx-theme>=0.12",
@@ -102,4 +103,4 @@ source = ["src", "**/site-packages/"]
 [tool.tox]
 legacy_tox_ini = "[tox]\nskipsdist=True\n\n[testenv:{pre-commit,mypy,pytest,docs}]\n# Don't create a virtualenv for the command, requires tox-direct plugin\ndirect = True\npassenv = *\nallowlist_externals = \n    pytest \n    pre-commit\n    mypy\n    sphinx-build\n    sphinx-autobuild\ncommands =\n    pytest: pytest {posargs}\n    mypy: mypy src tests {posargs}\n    pre-commit: pre-commit run --all-files {posargs}\n    docs: sphinx-{posargs:build -EW --keep-going} -T docs build/html\n"
 
-# dae_devops_fingerprint 85bc7819cab64410747d2862b8b362cf
+# dae_devops_fingerprint e8dc5dbb3ae97a67d5cdf71111ff771b
diff --git a/src/xchembku_api/datafaces/context.py b/src/xchembku_api/datafaces/context.py
@@ -4,10 +4,7 @@
 from xchembku_api.context_base import ContextBase
 
 # Things created in the context.
-from xchembku_api.datafaces.datafaces import (
-    Datafaces,
-    xchembku_datafaces_set_default,
-)
+from xchembku_api.datafaces.datafaces import Datafaces, xchembku_datafaces_set_default
 
 logger = logging.getLogger(__name__)
 

diff --git a/src/xchembku_cli/subcommands/start_services.py b/src/xchembku_cli/subcommands/start_services.py
@@ -3,8 +3,6 @@
 # Use standard logging in this module.
 import logging
 
-from dls_utilpack.callsign import callsign
-
 # Base class for cli subcommands.
 from xchembku_cli.subcommands.base import Base
 

diff --git a/src/xchembku_lib/contexts/classic.py b/src/xchembku_lib/contexts/classic.py
@@ -1,7 +1,6 @@
 import logging
 
 # Contexts.
-from dls_servbase_lib.datafaces.context import Context as DlsServbaseDatafaceContext
 from dls_utilpack.callsign import callsign
 
 # Utilities.