new devops with mysql in it

DiamondLightSource · May 26, 2023 · 7a22466 · 7a22466
1 parent 6896f14
commit 7a22466
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 64 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-normsql
 
 # ---------------------------------------------------------------------
@@ -69,4 +69,4 @@ publish_docs:
 	cp -r build/html/* $(DOCS_PUBLISH_ROOT)
 
 
-# dae_devops_fingerprint 7ad8e9ac2116461b84a0200de66ec86f
+# dae_devops_fingerprint 62bfff1938ace30f8cb33ab30b9c60d5
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-normsql
 
 Naming conventions
@@ -31,4 +31,4 @@ repository
     lowercase, hyphens
 
 
-.. # dae_devops_fingerprint d57378dce1a17dd03d4629d169efd5ca
+.. # dae_devops_fingerprint 8a72a4d0ee07d38513ef1273e9f9682e
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-normsql
 
 Developing
@@ -35,4 +35,4 @@ If you plan to modify the docs, you will need to::
     
 
 
-.. # dae_devops_fingerprint 06258b784a6611f9c5473dd7ab11d8c1
+.. # dae_devops_fingerprint 7b83e003f8bbbf54c27b4bd8141fb0e5
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-normsql
 
 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 315edec766c8c72d01b0fa9707eddd83
+.. # dae_devops_fingerprint d9ee7cc6b002b3508a4e55f96193c35e
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-normsql
 
 About the documentation
@@ -21,4 +21,4 @@ improve most documentation - often immensely.
 
 `More information on this topic. <https://documentation.divio.com>`_
 
-.. # dae_devops_fingerprint ec4b9c8af9a0c16a88c8afd2f10d8044
+.. # dae_devops_fingerprint eda941e8a0c3d217a601fb11b90f639b
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-normsql
 
 Installing
@@ -39,4 +39,4 @@ You can check the version that has been installed by typing::
     $ dls-normsql --version
     $ dls-normsql --version-json
 
-.. # dae_devops_fingerprint 9c071b85e47a709fdf94b44c012d3f03
+.. # dae_devops_fingerprint a2fe8dfbc79c151a5b899b244a529aa6
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-normsql
 
 Testing
@@ -31,4 +31,4 @@ This allows peeking in there to see what's been written by the test.
 
 
 
-.. # dae_devops_fingerprint 16749d7794075d5edc250b7e3a37ae35
+.. # dae_devops_fingerprint 1801aaf6bd998d192c9fb4cdd6c3e79f
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-normsql
 
 me=${BASH_SOURCE}
@@ -13,4 +13,4 @@ function __install {
 }
 
 
-# dae_devops_fingerprint 1a34e24b1d5a45cb1ca98a9cbad72c6e
+# dae_devops_fingerprint b7ad9765b7da993eecef6a4ce23802c2
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-normsql
 
 # This file is for use as a devcontainer and a runtime container
@@ -40,4 +40,4 @@ ENV PATH=/venv/bin:$PATH
 ENTRYPOINT ["dls-normsql"]
 CMD ["--version"]
 
-# dae_devops_fingerprint 6dc80a2a370a712769cdb9563fa17fc0
+# dae_devops_fingerprint a5c05253a7982ce4ee2e60abd1a254f0
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-normsql
 
 // For format details, see https://containers.dev/implementors/json_reference/
@@ -57,4 +57,4 @@
     "postCreateCommand": "pip install -e .[dev]"
 }
 
-// dae_devops_fingerprint 554efbeb9af2bdb211b7e057e098d375
+// dae_devops_fingerprint 1c59c18009b5b4578be9201b399a2b6c
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-normsql
 
 Contributing to the project
@@ -38,4 +38,4 @@ should follow.
 
 .. _Developer Guide: https://diamondlightsource.github.io/dls-normsql/main/developer/how-to/contribute.html
 
-.. # dae_devops_fingerprint fbbfd64dec105165b3aa9295ebd7cd6e
+.. # dae_devops_fingerprint 1e4da81da23bd1f1ea6d675517d6f9c5
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-normsql
 
 name: Install requirements
@@ -61,4 +61,4 @@ runs:
       shell: bash
 
 
-# dae_devops_fingerprint 60c68e2129decf28ed4e20b91c02763e
+# dae_devops_fingerprint 66e539b4856f80b66acfd95402e76d05
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-normsql
 
 # To get started with Dependabot version updates, you'll need to specify which
@@ -19,4 +19,4 @@ updates:
     schedule:
       interval: "weekly"
 
-# dae_devops_fingerprint c70363631c8e5cfa8a7053e5419dd1d4
+# dae_devops_fingerprint 61dd9f51dc2d4a0486ac8a76be91051f
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-normsql -->
 
 <!DOCTYPE html>
@@ -14,4 +14,4 @@
 
 </html>
 
-<!-- dae_devops_fingerprint 9a15f061b03d5fc0d77f921843125c46 -->
+<!-- dae_devops_fingerprint 4f2d286affbfbe691ff33fdbac641eb5 -->
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-normsql
 
 import json
@@ -102,4 +102,4 @@ def main(args=None):
 if __name__ == "__main__":
     main()
 
-# dae_devops_fingerprint 82ea8a19d01c89a49e187624838f2126
+# dae_devops_fingerprint dd357c9cfe8e116f70c977b7d94d62db
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-normsql
 
 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:
@@ -48,16 +48,6 @@ jobs:
             install: ".[dev,docs]"
 
     runs-on: ${{ matrix.os }}
-
-    services:
-      mysql_service:
-        image: mysql:8.0
-        ports:
-          - 3306
-        env:
-          MYSQL_ROOT_PASSWORD: root
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
-
     env:
       # https://github.com/pytest-dev/pytest/issues/2042
       PY_IGNORE_IMPORTMISMATCH: "1"
@@ -79,16 +69,11 @@ jobs:
       - name: List dependency tree
         run: pipdeptree
 
-      - name: Check MySQL service container status
-        run: docker ps
-
+      # 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
-        env:
-          MYSQL_HOST: 127.0.0.1
-          # MYSQL_PORT: ${{ job.services.mysql_service.ports[3306] }}
         run: |
           sudo apt install environment-modules
           export MODULESHOME=/usr/share/modules
@@ -230,4 +215,5 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_TOKEN }}
-# dae_devops_fingerprint 39b6ade54ad4279a47cb3da654b3721e
+
+# dae_devops_fingerprint d13e8289ca6252679ab7d9ae8db75617
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-normsql
 
 name: Docs CI
@@ -56,4 +56,4 @@ jobs:
           publish_dir: .github/pages
           keep_files: true
 
-# dae_devops_fingerprint fc42ff4e21df624b69d71d1daf733ff7
+# dae_devops_fingerprint 0c3ce8bebad77dab099617eae89e2247
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-normsql
 
 name: Docs Cleanup CI
@@ -46,4 +46,4 @@ jobs:
           git commit -am "Removing redundant docs version $DOCS_VERSION"
           git push
 
-# dae_devops_fingerprint 062f4bc18f25b11b80cbca161780c289
+# dae_devops_fingerprint b47d6e45e6ea9f929b8afe4f238d9473
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-normsql
 
 name: Link Check
@@ -27,4 +27,4 @@ jobs:
       - name: Check links
         run: tox -e docs build -- -b linkcheck
 
-# dae_devops_fingerprint 364f1f117764b2f547d91993c76ca046
+# dae_devops_fingerprint 674bb9fc122cc739ba92fe18045f0f1f
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-normsql
 
 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 b29bc99027c830817f5b2dd3c6c69c43
+# dae_devops_fingerprint f4eece0911ee4d3dbab40d858bc4962d
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-normsql */ 
 
 /* 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 6d64e77ebbc876fc118c61804d4caaba */ 
+/* dae_devops_fingerprint cadc619d1b64a206ac3a5e05c7b9d498 */ 
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-normsql
 
 from pathlib import Path
@@ -197,4 +197,4 @@ def setup(app):
     app.connect("source-read", ultimateReplace)
 
 
-# dae_devops_fingerprint a5475bf5aabb8f8db72e43bae4457f5e
+# dae_devops_fingerprint cd8b8b6c6077d960c9ed6af1579909b3
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-normsql
 
 [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 ecf3599f122f7e351e9e8366ada61f21
+# dae_devops_fingerprint ecc6232348dbe2bd0e46bde0c1961e3b
diff --git a/src/dls_normsql/aiomysql.py b/src/dls_normsql/aiomysql.py
@@ -51,7 +51,7 @@ def __init__(self, specification, database_definition_object):
         # We will do environment variable substitution for host and port if they start with $.
         self.__host = require(s, t, "host")
         if self.__host.startswith("$"):
-            envvar = Envvar(self.__host[1:])
+            envvar = Envvar(self.__host[1:], default="127.0.0.1")
             if not envvar.is_set:
                 raise RuntimeError(
                     f"configuration error: environment variable {self.__host[1:]} is not set"