diff --git a/.dae-devops/Makefile b/.dae-devops/Makefile index 5f78fd2..67f14d9 100644 --- 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 soakdb3 # --------------------------------------------------------------------- @@ -69,4 +69,4 @@ publish_docs: cp -r build/html/* $(DOCS_PUBLISH_ROOT) -# dae_devops_fingerprint 87a805e124ba86f4bd65972724e5536e +# dae_devops_fingerprint aa3527f5e00cc362a1553a0469ebd9c9 diff --git a/.dae-devops/docs/conventions.rst b/.dae-devops/docs/conventions.rst index 2a269de..c848a30 100644 --- 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 soakdb3 Naming conventions @@ -31,4 +31,4 @@ repository lowercase, hyphens -.. # dae_devops_fingerprint 6453b898fcb14e4dd9868afc1f5f1bbb +.. # dae_devops_fingerprint de902f373135c81a658a17ca32158297 diff --git a/.dae-devops/docs/developing.rst b/.dae-devops/docs/developing.rst index 1d726f2..b117336 100644 --- 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 soakdb3 Developing @@ -35,4 +35,4 @@ If you plan to modify the docs, you will need to:: -.. # dae_devops_fingerprint 8ac24e7d475343f39a39816553773644 +.. # dae_devops_fingerprint ee39ac128183f0afe7cce3adcab8dd2a diff --git a/.dae-devops/docs/devops.rst b/.dae-devops/docs/devops.rst index ed816fa..7544c6f 100644 --- 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 soakdb3 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 b8416adabeb5111a7b98ad394109a79c +.. # dae_devops_fingerprint 643e7f13e98318c4428bcec7cbb50a96 diff --git a/.dae-devops/docs/docs_structure.rst b/.dae-devops/docs/docs_structure.rst index e743061..f373c99 100644 --- 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 soakdb3 About the documentation @@ -21,4 +21,4 @@ improve most documentation - often immensely. `More information on this topic. `_ -.. # dae_devops_fingerprint 89ddc289acbc5ffa7a523b8ba73caab7 +.. # dae_devops_fingerprint f7cd26a8269dc852910966084289b296 diff --git a/.dae-devops/docs/installing.rst b/.dae-devops/docs/installing.rst index 41a7d0f..738ba94 100644 --- 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 soakdb3 Installing @@ -39,4 +39,4 @@ You can check the version that has been installed by typing:: $ soakdb3 --version $ soakdb3 --version-json -.. # dae_devops_fingerprint 810142999a0b0ce82f84405d06045331 +.. # dae_devops_fingerprint c122d062e225aa06bbb8e80da0553fd7 diff --git a/.dae-devops/docs/testing.rst b/.dae-devops/docs/testing.rst index f0bcc9d..ab3b5f2 100644 --- 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 soakdb3 Testing @@ -31,4 +31,4 @@ This allows peeking in there to see what's been written by the test. -.. # dae_devops_fingerprint a22a065e5a05bce5ad67e9ba97231e27 +.. # dae_devops_fingerprint 588faee19542e87356f922601b113be3 diff --git a/.dae-devops/prepare_git_dependencies.sh b/.dae-devops/prepare_git_dependencies.sh index 6f5ccf6..55a00d5 100644 --- 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 soakdb3 me=${BASH_SOURCE} @@ -13,4 +13,4 @@ function __install { } -# dae_devops_fingerprint 753ce12fdda9cc021f8957ddfbdbe801 \ No newline at end of file +# dae_devops_fingerprint b5d67b78d8b53f60536200e8bfa6d4d6 \ No newline at end of file diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 88d9881..26396cf 100644 --- 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 soakdb3 # This file is for use as a devcontainer and a runtime container @@ -40,4 +40,4 @@ ENV PATH=/venv/bin:$PATH ENTRYPOINT ["soakdb3"] CMD ["--version"] -# dae_devops_fingerprint 39df2a406e916c32866fa828b95cedb5 +# dae_devops_fingerprint b47bdd9a358105e4dd26f540f42bbf7b diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index de85bf8..ea22e55 100644 --- 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 soakdb3 // For format details, see https://containers.dev/implementors/json_reference/ @@ -57,4 +57,4 @@ "postCreateCommand": "pip install -e .[dev]" } -// dae_devops_fingerprint 31d735cec5e9348b087931e94ad86201 +// dae_devops_fingerprint 9524218bef5e86a01794006032ad7fcb diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst index 1446114..699d1a8 100644 --- 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 soakdb3 Contributing to the project @@ -38,4 +38,4 @@ should follow. .. _Developer Guide: https://diamondlightsource.github.io/soakdb3/main/developer/how-to/contribute.html -.. # dae_devops_fingerprint 9ece2d6c151df46e92d82ccf45c9798d +.. # dae_devops_fingerprint 9f9b8d29e13fc36a91cb18e92de3c255 diff --git a/.github/actions/install_requirements/action.yml b/.github/actions/install_requirements/action.yml index da70bca..8c5af7c 100644 --- 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 soakdb3 name: Install requirements @@ -61,4 +61,4 @@ runs: shell: bash -# dae_devops_fingerprint 81c2c8158521f1250c495d4b0a6720bd +# dae_devops_fingerprint 4bec23778f08376d659e5f9a364d8090 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3e90320..b479e5e 100644 --- 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 soakdb3 # To get started with Dependabot version updates, you'll need to specify which @@ -19,4 +19,4 @@ updates: schedule: interval: "weekly" -# dae_devops_fingerprint 7e737a508027cc9682746bf87ac927c3 +# dae_devops_fingerprint 0f56118bd55142e0710b36f4ac80c196 diff --git a/.github/pages/index.html b/.github/pages/index.html index 65c701f..e2a6dd7 100644 --- a/.github/pages/index.html +++ b/.github/pages/index.html @@ -1,5 +1,5 @@ - + @@ -14,4 +14,4 @@ - + diff --git a/.github/pages/make_switcher.py b/.github/pages/make_switcher.py index 5475d4e..6ffdd61 100644 --- 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 soakdb3 import json @@ -102,4 +102,4 @@ def main(args=None): if __name__ == "__main__": main() -# dae_devops_fingerprint d20329d39ea50acd6e85c5f3ac9ab0bf +# dae_devops_fingerprint ab3ccbd5659d924b435fbf16b8432c57 diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 4b21ca8..a0d5c09 100644 --- 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 soakdb3 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 cc92d3a654008a26c7e0e9648091e4c3 +# dae_devops_fingerprint adf2b49cc576a9c060e1d3257841b202 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4d2a42d..e17682e 100644 --- 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 soakdb3 name: Docs CI @@ -56,4 +56,4 @@ jobs: publish_dir: .github/pages keep_files: true -# dae_devops_fingerprint 07e76c18742a37be1ceacc9c7959ad7a +# dae_devops_fingerprint b7a223c7e424fa87fa8a411a885477e5 diff --git a/.github/workflows/docs_clean.yml b/.github/workflows/docs_clean.yml index 98cf30c..134f7a5 100644 --- 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 soakdb3 name: Docs Cleanup CI @@ -46,4 +46,4 @@ jobs: git commit -am "Removing redundant docs version $DOCS_VERSION" git push -# dae_devops_fingerprint 04731d9633eeadad36095a006ca507f9 +# dae_devops_fingerprint ea9d13b83d6931e7a1f8beb23393a10d diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index 70d999b..98cd734 100644 --- 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 soakdb3 name: Link Check @@ -27,4 +27,4 @@ jobs: - name: Check links run: tox -e docs build -- -b linkcheck -# dae_devops_fingerprint 48c9a6457376f210baf2e716179a3de1 +# dae_devops_fingerprint 577e29e04eaace429f3b265715dd1db0 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3f7f6f..0b850cc 100644 --- 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 soakdb3 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 138dfc3a58570e6d90eb4732e7338781 +# dae_devops_fingerprint 7738035675008c0815875d47c0aab949 diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css index 7fe7445..ca742ac 100644 --- 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 soakdb3 */ /* 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 db7bb96ebbd13db24e39aa71932fa228 */ +/* dae_devops_fingerprint 18b364be4830ff06599c595e92feab70 */ diff --git a/docs/conf.py b/docs/conf.py index edfcaea..f2ecbde 100644 --- 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 soakdb3 from pathlib import Path @@ -197,4 +197,4 @@ def setup(app): app.connect("source-read", ultimateReplace) -# dae_devops_fingerprint 1436ce76b6fbb352ef4be88f7f20ddad +# dae_devops_fingerprint 1dd14a8b44868cb503a53c4871d7fcaf diff --git a/pyproject.toml b/pyproject.toml index e81639b..04ac2f8 100644 --- 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 soakdb3 [build-system] @@ -103,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 acfd9f0fe647aa3a3b3fa87e1a07a9f1 +# dae_devops_fingerprint b2c1b99fc8739454fdb7b59260854e73