diff --git a/.dae-devops/Makefile b/.dae-devops/Makefile index 68791f7..3cde4d8 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac # --------------------------------------------------------------------- @@ -69,4 +69,4 @@ publish_docs: cp -r build/html/* $(DOCS_PUBLISH_ROOT) -# dae_devops_fingerprint 6a189e1f58e208dab98164f85d67c08a +# dae_devops_fingerprint abd00978fdb0dca4f5b712aee934cad6 diff --git a/.dae-devops/docs/conventions.rst b/.dae-devops/docs/conventions.rst index 769ec35..b2d09fb 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.4.0. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name dls-mainiac Naming conventions @@ -31,4 +31,4 @@ repository lowercase, hyphens -.. # dae_devops_fingerprint e81d908a240f359f8bb87b29d3d642c0 +.. # dae_devops_fingerprint c86ce0b9cdd0c6fbd8d28a60b6dccc48 diff --git a/.dae-devops/docs/developing.rst b/.dae-devops/docs/developing.rst index fb9f7b8..8e79f63 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.4.0. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name dls-mainiac Developing @@ -13,7 +13,7 @@ Clone the repository:: It is recommended that you install into a virtual environment so this installation will not interfere with any existing Python software. -Make sure to have at least python version 3.8 then:: +Make sure to have at least python version 3.9 then:: $ python3 -m venv /scratch/$USER/myvenv $ source /scratch/$USER/myvenv/bin/activate @@ -36,4 +36,4 @@ If you plan to modify the docs, you will need to:: -.. # dae_devops_fingerprint c32498c7764254e3dffe6a54dfed218a +.. # dae_devops_fingerprint d3f9b85de66eef434bd0037c6dbe955e diff --git a/.dae-devops/docs/devops.rst b/.dae-devops/docs/devops.rst index 28e0aa4..39a1d49 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.4.0. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name dls-mainiac Devops @@ -43,4 +43,4 @@ Publishing:: -.. # dae_devops_fingerprint 1f20cafa9f801abf5ce00e5f5cfd9e47 +.. # dae_devops_fingerprint d69cdc1e76b7b6776119729a1cfe48c9 diff --git a/.dae-devops/docs/docs_structure.rst b/.dae-devops/docs/docs_structure.rst index 9fafa06..714bada 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.4.0. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name dls-mainiac About the documentation @@ -21,4 +21,4 @@ improve most documentation - often immensely. `More information on this topic. `_ -.. # dae_devops_fingerprint 5298bd3fa64ecd380d7d2f9df9f9dede +.. # dae_devops_fingerprint 7dbb7e7b34455dfcd954c7f19d4dde5c diff --git a/.dae-devops/docs/installing.rst b/.dae-devops/docs/installing.rst index 62ef10d..84b07a3 100644 --- a/.dae-devops/docs/installing.rst +++ b/.dae-devops/docs/installing.rst @@ -1,16 +1,16 @@ .. # ********** Please don't edit this file! -.. # ********** It has been generated automatically by dae_devops version 0.4.0. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name dls-mainiac Installing ======================================================================= -You will need python 3.8 or later. +You will need python 3.9 or later. -On a Diamond Light Source internal computer, you can achieve Python 3.8 by:: +On a Diamond Light Source internal computer, you can achieve Python 3.9 by:: - $ module load python/3.8 + $ module load python/3.9 You can check your version of python by typing into a terminal:: @@ -40,4 +40,4 @@ You can check the version that has been installed by typing:: $ dls-mainiac --version $ dls-mainiac --version-json -.. # dae_devops_fingerprint 506ea59a5f74cfe90cf3154c082a3801 +.. # dae_devops_fingerprint 662dc0ddb3ea386061a3c93ecb892946 diff --git a/.dae-devops/docs/testing.rst b/.dae-devops/docs/testing.rst index ae1cdfb..2358d3a 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.4.0. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name dls-mainiac Testing @@ -35,4 +35,4 @@ This allows peeking in there to see what's been written by the test. -.. # dae_devops_fingerprint da669122a38470f54ac7d65d96bbb265 +.. # dae_devops_fingerprint c86436441b88ce2e684a1255980a64ba diff --git a/.dae-devops/prepare_git_dependencies.sh b/.dae-devops/prepare_git_dependencies.sh index cf5a8c4..2cc8d88 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac me=${BASH_SOURCE} @@ -13,4 +13,4 @@ function __install { } -# dae_devops_fingerprint 425bdc4b6420ecc5764f1298090aeffa \ No newline at end of file +# dae_devops_fingerprint 32c4a266f1c1cb7a1043d0bdf2548738 \ No newline at end of file diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ada0015..5529ce1 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac # This file is for use as a devcontainer and a runtime container @@ -40,4 +40,4 @@ ENV PATH=/venv/bin:$PATH ENTRYPOINT ["dls-mainiac"] CMD ["--version"] -# dae_devops_fingerprint aa36110021bcbdd4c0570a037e844916 +# dae_devops_fingerprint c7699c5a7a2ce97530f5bc2cdbb75a2b diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 47d7206..91414a6 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.4.0. +// ********** It has been generated automatically by dae_devops version 0.5.1. // ********** For repository_name dls-mainiac // For format details, see https://containers.dev/implementors/json_reference/ @@ -57,4 +57,4 @@ "postCreateCommand": "pip install -e .[dev]" } -// dae_devops_fingerprint ffe3e33792acbb7f26883b28a712ea90 +// dae_devops_fingerprint 7e9af4818af531b00d42aaba98f1b3ee diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst index bbfa93a..9aed53b 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.4.0. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name dls-mainiac Contributing to the project @@ -38,4 +38,4 @@ should follow. .. _Developer Guide: https://diamondlightsource.github.io/dls-mainiac/main/developer/how-to/contribute.html -.. # dae_devops_fingerprint 6d52f7cf994efbc027e52fab1c936326 +.. # dae_devops_fingerprint ffeb92991ab473232d7bb1b6b7d7dc09 diff --git a/.github/actions/install_requirements/action.yml b/.github/actions/install_requirements/action.yml index eb5548a..264a651 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac name: Install requirements @@ -61,4 +61,4 @@ runs: shell: bash -# dae_devops_fingerprint ddea27112cf29c4b78891b234145ec56 +# dae_devops_fingerprint 36877b264008ed189f2e223bdf3c7def diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3934e88..d55700d 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac # To get started with Dependabot version updates, you'll need to specify which @@ -19,4 +19,4 @@ updates: schedule: interval: "weekly" -# dae_devops_fingerprint 69954a05a77602c19c48b9c282e996ed +# dae_devops_fingerprint dda3fc2e5e14ca0bbb1782bd9ce2228f diff --git a/.github/pages/index.html b/.github/pages/index.html index fbca5e4..61bf73a 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 c2e937a..ddc780e 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac import json @@ -102,4 +102,4 @@ def main(args=None): if __name__ == "__main__": main() -# dae_devops_fingerprint a7c9eb848d5086fa20df46c482dd2a83 +# dae_devops_fingerprint 75c26c15a22cf5b8575c43e1f1d02377 diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 19d81db..c5bbfe8 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac name: Code CI @@ -39,12 +39,12 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest"] # can add windows-latest, macos-latest - python: ["3.9", "3.10", "3.11"] + python: ["3.10", "3.11"] install: ["-e .[dev,docs]"] # Make one version be non-editable to test both paths of version code include: - os: "ubuntu-latest" - python: "3.8" + python: "3.9" install: ".[dev,docs]" runs-on: ${{ matrix.os }} @@ -116,7 +116,7 @@ jobs: - name: Test module --version works using the installed wheel # If more than one module in src/ replace with module name to test - run: python -m $(ls src | grep -v egg-info | head -1) --version + run: dls-mainiac --version-json container: needs: [lint, dist, test] @@ -196,7 +196,7 @@ jobs: - name: Github Release # We pin to the SHA, not the tag, for security reasons. # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions - uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v0.1.14 + uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15 with: prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }} files: | @@ -212,4 +212,4 @@ jobs: with: password: ${{ secrets.PYPI_TOKEN }} -# dae_devops_fingerprint c2f0c84505f9471a61bdd69831c77baf +# dae_devops_fingerprint 73c6b135238d146e7e101a609e0bbaad diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 41348bc..c39a2f0 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac name: Docs CI @@ -50,10 +50,10 @@ jobs: if: github.event_name == 'push' && github.actor != 'dependabot[bot]' # We pin to the SHA, not the tag, for security reasons. # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions - uses: peaceiris/actions-gh-pages@de7ea6f8efb354206b205ef54722213d99067935 # v3.9.0 + uses: peaceiris/actions-gh-pages@bd8c6b06eba6b3d25d72b7a1767993c0aeee42e7 # v3.9.2 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: .github/pages keep_files: true -# dae_devops_fingerprint 1ff7521ec172e2a7d2bc848e17766dbf +# dae_devops_fingerprint 39038f36c1e7f87d64178a26d50755f1 diff --git a/.github/workflows/docs_clean.yml b/.github/workflows/docs_clean.yml index 13a11db..fee2e4b 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac name: Docs Cleanup CI @@ -46,4 +46,4 @@ jobs: git commit -am "Removing redundant docs version $DOCS_VERSION" git push -# dae_devops_fingerprint bbabb97b9652f0f87826b260747cbc6d +# dae_devops_fingerprint 6d63a6e84daba4f90f717f8cbad68053 diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index 79b6367..4be4378 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac name: Link Check @@ -27,4 +27,4 @@ jobs: - name: Check links run: tox -e docs build -- -b linkcheck -# dae_devops_fingerprint 345ff797c8b33044a6c336d820ff26d1 +# dae_devops_fingerprint 23be664ddef5507c4c7eca59c95c3ca6 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbcd269..c2155c5 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac 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 41eff2bc538ec10d98c0aa5cda48f8c7 +# dae_devops_fingerprint c64aad265e67d52f70b276f6e2b1b97c diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css index 5889812..ad4e081 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.4.0. */ +/* ********** It has been generated automatically by dae_devops version 0.5.1. */ /* ********** For repository_name dls-mainiac */ /* 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 e70bcfe8cc9cf49574ad6a5e123d00cc */ +/* dae_devops_fingerprint 787c743c3002cac50e98546a00abcf9a */ diff --git a/docs/conf.py b/docs/conf.py index d0da334..2ce82db 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac from pathlib import Path @@ -188,7 +188,7 @@ def ultimateReplace(app, docname, source): "$" + "{repository_name}": "dls-mainiac", "$" + "{package_name}": "dls_mainiac_lib", "$" + "{git_url}": "https://gitlab.diamond.ac.uk/kbp43231", - "$" + "{python_version_at_least}": "3.8", + "$" + "{python_version_at_least}": "3.9", } @@ -197,4 +197,4 @@ def setup(app): app.connect("source-read", ultimateReplace) -# dae_devops_fingerprint b18529110b22038ebcd25056553d6fce +# dae_devops_fingerprint c4208078ea91a61b1ae6f9d3e509e0fb diff --git a/pyproject.toml b/pyproject.toml index e973ade..fc4f420 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.4.0. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name dls-mainiac [build-system] @@ -11,7 +11,6 @@ name = "dls-mainiac" classifiers = [ "Development Status :: 3 - Alpha", "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -21,11 +20,11 @@ dependencies = ["dls-utilpack", "dls-logformatter", "prettytable", "psutil", "se dynamic = ["version"] license.file = "LICENSE" readme = "README.rst" -requires-python = ">=3.8" +requires-python = ">=3.9" [project.optional-dependencies] dev = [ - "black", + "black==22.12.0", "mypy", "flake8-isort", "Flake8-pyproject", @@ -102,4 +101,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 5d9bc3f362592ad90c11b25521518ed5 +# dae_devops_fingerprint e2a60ea664c48b18fa6ca472d4e0d042