devops 5.3

DiamondLightSource · May 26, 2023 · 830a30e · 830a30e
1 parent d6f46ad
commit 830a30e
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 47 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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 # ---------------------------------------------------------------------
@@ -69,4 +69,4 @@ publish_docs:
 	cp -r build/html/* $(DOCS_PUBLISH_ROOT)
 
 
-# dae_devops_fingerprint 9d6b41a16b901f855bd09f8a5743bfa8
+# dae_devops_fingerprint 7a40fdc6afce4991715aeda7ae70c444
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.3.dev1+g36e9e1c.d20230523.
+.. # ********** It has been generated automatically by dae_devops version 0.5.3.
 .. # ********** For repository_name dls-servbase
 
 Naming conventions
@@ -31,4 +31,4 @@ repository
     lowercase, hyphens
 
 
-.. # dae_devops_fingerprint 94379720e1dca624dcebe759adc32cde
+.. # dae_devops_fingerprint cbd0a78343b6577aa4ddb9d59a242b04
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.3.dev1+g36e9e1c.d20230523.
+.. # ********** It has been generated automatically by dae_devops version 0.5.3.
 .. # ********** For repository_name dls-servbase
 
 Developing
@@ -35,4 +35,4 @@ If you plan to modify the docs, you will need to::
     
 
 
-.. # dae_devops_fingerprint eebb86b2433c3c3668ed0e68c2060ce3
+.. # dae_devops_fingerprint ac891cf352ef89b3b20d2c601dd9ddc4
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.3.dev1+g36e9e1c.d20230523.
+.. # ********** It has been generated automatically by dae_devops version 0.5.3.
 .. # ********** For repository_name dls-servbase
 
 Devops
@@ -44,4 +44,4 @@ Publishing (for the Diamond intranet)::
     
 The Diamond intranet commands are not used for production. The production packaging and publishing are handled in the GitHub Actions workflows mechanism.
 
-.. # dae_devops_fingerprint 56f856790e651a5410544bcfb52d77f9
+.. # dae_devops_fingerprint 84e8a32100211cbba64804a3e5c5b337
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.3.dev1+g36e9e1c.d20230523.
+.. # ********** It has been generated automatically by dae_devops version 0.5.3.
 .. # ********** For repository_name dls-servbase
 
 About the documentation
@@ -21,4 +21,4 @@ improve most documentation - often immensely.
 
 `More information on this topic. <https://documentation.divio.com>`_
 
-.. # dae_devops_fingerprint afcec7e660b5cb952ab0381111043f43
+.. # dae_devops_fingerprint 6ef08be920f12050c1c579cf6e9d4253
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.3.dev1+g36e9e1c.d20230523.
+.. # ********** It has been generated automatically by dae_devops version 0.5.3.
 .. # ********** For repository_name dls-servbase
 
 Installing
@@ -39,4 +39,4 @@ You can check the version that has been installed by typing::
     $ dls-servbase --version
     $ dls-servbase --version-json
 
-.. # dae_devops_fingerprint d98511eda41e5ec9dfee88bd0263bb66
+.. # dae_devops_fingerprint 64d7ae0dde8939e479b9c793df928d15
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.3.dev1+g36e9e1c.d20230523.
+.. # ********** It has been generated automatically by dae_devops version 0.5.3.
 .. # ********** For repository_name dls-servbase
 
 Testing
@@ -31,4 +31,4 @@ This allows peeking in there to see what's been written by the test.
 
 
 
-.. # dae_devops_fingerprint 813b0334290efd50c2d7ce4016da0dd9
+.. # dae_devops_fingerprint 3bd80bbd88306473a1ee98b988b17986
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 me=${BASH_SOURCE}
@@ -13,4 +13,4 @@ function __install {
 }
 
 
-# dae_devops_fingerprint 05c763871274d8238b3646237d61135e
+# dae_devops_fingerprint 663e11dbca4cdd5f84a218a64398a688
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 # This file is for use as a devcontainer and a runtime container
@@ -40,4 +40,4 @@ ENV PATH=/venv/bin:$PATH
 ENTRYPOINT ["dls-servbase"]
 CMD ["--version"]
 
-# dae_devops_fingerprint 0feaa75887d5dc7e333642766f3bf0e6
+# dae_devops_fingerprint 80986671f8602f6e4666f78f98141826
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.3.dev1+g36e9e1c.d20230523.
+// ********** It has been generated automatically by dae_devops version 0.5.3.
 // ********** For repository_name dls-servbase
 
 // For format details, see https://containers.dev/implementors/json_reference/
@@ -57,4 +57,4 @@
     "postCreateCommand": "pip install -e .[dev]"
 }
 
-// dae_devops_fingerprint 98e4a132e4fdcd0df6d661f6bc2b43be
+// dae_devops_fingerprint 35358278c2556f05447815a0833301dc
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.3.dev1+g36e9e1c.d20230523.
+.. # ********** It has been generated automatically by dae_devops version 0.5.3.
 .. # ********** For repository_name dls-servbase
 
 Contributing to the project
@@ -38,4 +38,4 @@ should follow.
 
 .. _Developer Guide: https://diamondlightsource.github.io/dls-servbase/main/developer/how-to/contribute.html
 
-.. # dae_devops_fingerprint 5e16346b414b86d30bb6f91a53f2a74a
+.. # dae_devops_fingerprint 0f4cbc1f77b787f03a9a4d268ed08055
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 name: Install requirements
@@ -61,4 +61,4 @@ runs:
       shell: bash
 
 
-# dae_devops_fingerprint 6e198d3569b69252542e666770294e24
+# dae_devops_fingerprint 492458ca501cde9a298a80a102ff22a4
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 # To get started with Dependabot version updates, you'll need to specify which
@@ -19,4 +19,4 @@ updates:
     schedule:
       interval: "weekly"
 
-# dae_devops_fingerprint b3be937b70abef292f3c9cda6ae5b12d
+# dae_devops_fingerprint b5838c5e0d9b5041500c5cb701fb5e5b
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.3.dev1+g36e9e1c.d20230523. -->
+<!-- ********** It has been generated automatically by dae_devops version 0.5.3. -->
 <!-- ********** For repository_name dls-servbase -->
 
 <!DOCTYPE html>
@@ -14,4 +14,4 @@
 
 </html>
 
-<!-- dae_devops_fingerprint c95579ef3ab1d6724c11bd6319508b62 -->
+<!-- dae_devops_fingerprint f42d18d6994629b2878c5e7336501264 -->
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 import json
@@ -102,4 +102,4 @@ def main(args=None):
 if __name__ == "__main__":
     main()
 
-# dae_devops_fingerprint 63e494af602e6fae359363b564c6fe01
+# dae_devops_fingerprint 7a1b58b851c5198d7d380e4ab78d0b49
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 name: Code CI
@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python: ["3.10", "3.11"]
+        python: ["3.10"]
         install: ["-e .[dev,docs]"]
         # Make one version be non-editable to test both paths of version code
         include:
@@ -69,6 +69,10 @@ jobs:
       - name: List dependency tree
         run: pipdeptree
 
+      # TODO: Make startup of MySQL able to be configured.
+      - name: Start up the MySQL that comes with Unbuntu
+        run: sudo /etc/init.d/mysql start
+
       - name: Run tests
         run: |
           sudo apt install environment-modules
@@ -212,4 +216,4 @@ jobs:
         with:
           password: ${{ secrets.PYPI_TOKEN }}
 
-# dae_devops_fingerprint c83f7625277d38123457181b8c90e48f
+# dae_devops_fingerprint 480a147d8af93a934e6ad0fd272e60e5
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 name: Docs CI
@@ -56,4 +56,4 @@ jobs:
           publish_dir: .github/pages
           keep_files: true
 
-# dae_devops_fingerprint f3b488c471047c76aea8f825d07c18bd
+# dae_devops_fingerprint fb2dde86086783119d0b0b805151bf09
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 name: Docs Cleanup CI
@@ -46,4 +46,4 @@ jobs:
           git commit -am "Removing redundant docs version $DOCS_VERSION"
           git push
 
-# dae_devops_fingerprint 8c38ddcc9cef1d2542c8c10b7bf07ef9
+# dae_devops_fingerprint d46d59a6f5197bd11b1cece615feb4df
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 name: Link Check
@@ -27,4 +27,4 @@ jobs:
       - name: Check links
         run: tox -e docs build -- -b linkcheck
 
-# dae_devops_fingerprint 867fe06b3073c6d7dbcb7419a7654068
+# dae_devops_fingerprint 0198bfb9fadda488379138f6b2e7f5e3
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 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 6db22c11e44b2e4faf915158345ffee7
+# dae_devops_fingerprint 814043c19b1379f7f1d7b188546a7734
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.3.dev1+g36e9e1c.d20230523. */ 
+/* ********** It has been generated automatically by dae_devops version 0.5.3. */ 
 /* ********** For repository_name dls-servbase */ 
 
 /* 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 b7a24fe59931733079a4121c7833c2d8 */ 
+/* dae_devops_fingerprint b94b4f0075614442e536fdd79bcf79f7 */ 
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 from pathlib import Path
@@ -197,4 +197,4 @@ def setup(app):
     app.connect("source-read", ultimateReplace)
 
 
-# dae_devops_fingerprint ba6ece62c7dc3689eb6fad112cadcd16
+# dae_devops_fingerprint 529445ac120d879ddd71245754e51ecb
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.3.dev1+g36e9e1c.d20230523.
+# ********** It has been generated automatically by dae_devops version 0.5.3.
 # ********** For repository_name dls-servbase
 
 [build-system]
@@ -102,4 +102,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 44036d8720305615f23b52785a963a89
+# dae_devops_fingerprint ca7c759c4aa01b455a13284486cf7eaa