From 4984e1376f6ea7ec0218dd75b18cd5f960bc8fb4 Mon Sep 17 00:00:00 2001 From: David Erb Date: Sat, 4 Feb 2023 09:02:51 +0000 Subject: [PATCH] update devops --- .dae-devops/Makefile | 4 ++-- .dae-devops/docs/conventions.rst | 4 ++-- .dae-devops/docs/developing.rst | 6 +++--- .dae-devops/docs/devops.rst | 4 ++-- .dae-devops/docs/docs_structure.rst | 4 ++-- .dae-devops/docs/installing.rst | 10 +++++----- .dae-devops/docs/testing.rst | 4 ++-- .dae-devops/prepare_git_dependencies.sh | 4 ++-- .devcontainer/Dockerfile | 4 ++-- .devcontainer/devcontainer.json | 4 ++-- .github/CONTRIBUTING.rst | 4 ++-- .github/actions/install_requirements/action.yml | 4 ++-- .github/dependabot.yml | 4 ++-- .github/pages/index.html | 4 ++-- .github/pages/make_switcher.py | 4 ++-- .github/workflows/code.yml | 8 ++++---- .github/workflows/docs.yml | 4 ++-- .github/workflows/docs_clean.yml | 4 ++-- .github/workflows/linkcheck.yml | 4 ++-- .gitlab-ci.yml | 4 ++-- docs/_static/css/custom.css | 4 ++-- docs/conf.py | 6 +++--- pyproject.toml | 9 ++++----- 23 files changed, 55 insertions(+), 56 deletions(-) diff --git a/.dae-devops/Makefile b/.dae-devops/Makefile index a39e5fc..8380e24 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator # --------------------------------------------------------------------- @@ -69,4 +69,4 @@ publish_docs: cp -r build/html/* $(DOCS_PUBLISH_ROOT) -# dae_devops_fingerprint 9fe30eea1b281488db7e7f559ccf11fd +# dae_devops_fingerprint fa91d06926a32d8ff4980e6c5026842a diff --git a/.dae-devops/docs/conventions.rst b/.dae-devops/docs/conventions.rst index e4844d2..a6f5b09 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.1.dev0+g5d50877.d20230202. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name echolocator Naming conventions @@ -31,4 +31,4 @@ repository lowercase, hyphens -.. # dae_devops_fingerprint acfc12550a704c2bae356c671aed9664 +.. # dae_devops_fingerprint 7830c296da87a975c0ebe83db00c21a9 diff --git a/.dae-devops/docs/developing.rst b/.dae-devops/docs/developing.rst index 4626175..b7b773e 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.1.dev0+g5d50877.d20230202. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name echolocator 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 5e0aaf283342a2eb98b29fa132e40755 +.. # dae_devops_fingerprint c3acd7bd04d4c567174c7ba12f90efb0 diff --git a/.dae-devops/docs/devops.rst b/.dae-devops/docs/devops.rst index 8f68abf..4be28bb 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.1.dev0+g5d50877.d20230202. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name echolocator Devops @@ -43,4 +43,4 @@ Publishing:: -.. # dae_devops_fingerprint b6eefa8217e4dc4f474235991d4a5ba7 +.. # dae_devops_fingerprint 28cb19a7e59bd4e67a85edec626a491e diff --git a/.dae-devops/docs/docs_structure.rst b/.dae-devops/docs/docs_structure.rst index 728fd39..318a3ea 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.1.dev0+g5d50877.d20230202. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name echolocator About the documentation @@ -21,4 +21,4 @@ improve most documentation - often immensely. `More information on this topic. `_ -.. # dae_devops_fingerprint e18335e3651840ab0035e2cc1d1132ea +.. # dae_devops_fingerprint 8ded9698d9d71eda17e2c49cd737a2e2 diff --git a/.dae-devops/docs/installing.rst b/.dae-devops/docs/installing.rst index ad8bca3..0d8690d 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.1.dev0+g5d50877.d20230202. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name echolocator 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:: $ echolocator --version $ echolocator --version-json -.. # dae_devops_fingerprint 903b31cf688e078d4db83026cfdc7061 +.. # dae_devops_fingerprint 3b5d52d009337767488822fafe22e1e7 diff --git a/.dae-devops/docs/testing.rst b/.dae-devops/docs/testing.rst index 238c4ac..5b299cc 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.1.dev0+g5d50877.d20230202. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name echolocator Testing @@ -35,4 +35,4 @@ This allows peeking in there to see what's been written by the test. -.. # dae_devops_fingerprint a9541d30f1759f15f8319a09442ffd7c +.. # dae_devops_fingerprint a5fefb92ded789eda5a2e4423a4e58e6 diff --git a/.dae-devops/prepare_git_dependencies.sh b/.dae-devops/prepare_git_dependencies.sh index 46e8cfc..0837678 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator me=${BASH_SOURCE} @@ -13,4 +13,4 @@ function __install { } -# dae_devops_fingerprint 8024a3374581bfef1e1262baaca81f98 \ No newline at end of file +# dae_devops_fingerprint 6a2693fd8a702bdea55e95346b54e455 \ No newline at end of file diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3df9512..60abb7b 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator # This file is for use as a devcontainer and a runtime container @@ -40,4 +40,4 @@ ENV PATH=/venv/bin:$PATH ENTRYPOINT ["echolocator"] CMD ["--version"] -# dae_devops_fingerprint dcc56c6c4e5e6290a064eea1f6529c93 +# dae_devops_fingerprint b2386a8edacc7cf00dbcde0bcfe434a4 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d6cc14a..4ffc841 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.1.dev0+g5d50877.d20230202. +// ********** It has been generated automatically by dae_devops version 0.5.1. // ********** For repository_name echolocator // For format details, see https://containers.dev/implementors/json_reference/ @@ -57,4 +57,4 @@ "postCreateCommand": "pip install -e .[dev]" } -// dae_devops_fingerprint 788cc46686ef73f5bd7cf96a4dcc245c +// dae_devops_fingerprint 2507140a2722f4fa02e13592d5038e0e diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst index 9a79630..491ed51 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.1.dev0+g5d50877.d20230202. +.. # ********** It has been generated automatically by dae_devops version 0.5.1. .. # ********** For repository_name echolocator Contributing to the project @@ -38,4 +38,4 @@ should follow. .. _Developer Guide: https://diamondlightsource.github.io/echolocator/main/developer/how-to/contribute.html -.. # dae_devops_fingerprint eed625051f6f5ae336ffbda5cc592433 +.. # dae_devops_fingerprint aed6364e5eff2f9face6b54b84a417f7 diff --git a/.github/actions/install_requirements/action.yml b/.github/actions/install_requirements/action.yml index 3cdc75b..e4fa60f 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator name: Install requirements @@ -61,4 +61,4 @@ runs: shell: bash -# dae_devops_fingerprint dcae291f67d70ac5632fc67f6eddc9c1 +# dae_devops_fingerprint 6290682d4770755c7566572965cef561 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5395eba..25b96f5 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator # To get started with Dependabot version updates, you'll need to specify which @@ -19,4 +19,4 @@ updates: schedule: interval: "weekly" -# dae_devops_fingerprint d074776e81e16910fb777b18d7269035 +# dae_devops_fingerprint 27e905899401fd7a982d82c6788a2760 diff --git a/.github/pages/index.html b/.github/pages/index.html index b029809..4c02dfb 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 313391c..b38e1c2 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator import json @@ -102,4 +102,4 @@ def main(args=None): if __name__ == "__main__": main() -# dae_devops_fingerprint 6f3d92f41b955e157b5764b96dcba6de +# dae_devops_fingerprint 5eddb1e43a2e9f5696fb135b3351e1e0 diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 39ddd1d..b7d84fa 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator 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 }} @@ -212,4 +212,4 @@ jobs: with: password: ${{ secrets.PYPI_TOKEN }} -# dae_devops_fingerprint 8585a3e2639f04309c94946160d109fa +# dae_devops_fingerprint 3cd3d1b7aa3767bc7752d04d0cff1b98 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8b4975c..6a6a8cb 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator name: Docs CI @@ -56,4 +56,4 @@ jobs: publish_dir: .github/pages keep_files: true -# dae_devops_fingerprint 17efd92ffbbb9ef2121630d43638d306 +# dae_devops_fingerprint 516501c026fa1f7af1e7a6d88d046406 diff --git a/.github/workflows/docs_clean.yml b/.github/workflows/docs_clean.yml index 6a43fc8..16e157c 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator name: Docs Cleanup CI @@ -46,4 +46,4 @@ jobs: git commit -am "Removing redundant docs version $DOCS_VERSION" git push -# dae_devops_fingerprint 957969bb26082bb2326218764498463c +# dae_devops_fingerprint 923700bb09fb043a8cdcb2b78e384f09 diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index 27a1171..4c86010 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator name: Link Check @@ -27,4 +27,4 @@ jobs: - name: Check links run: tox -e docs build -- -b linkcheck -# dae_devops_fingerprint 2cc4639bef9fa6ab83bfeba12ea488a0 +# dae_devops_fingerprint d1ce8eee255cbe72206419b8b28d43df diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 681474a..2ccbdc2 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator 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 637e29605da1307b041b46902433c17e +# dae_devops_fingerprint 32c6a111d128370b1daac92e1f2aecbe diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css index 3d4b410..c82089b 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.1.dev0+g5d50877.d20230202. */ +/* ********** It has been generated automatically by dae_devops version 0.5.1. */ /* ********** For repository_name echolocator */ /* 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 8d6057dc3380959a6c8ac6524c570bf0 */ +/* dae_devops_fingerprint 35feb33b9a913af2c9c4c41aaeba16f5 */ diff --git a/docs/conf.py b/docs/conf.py index cdf9d83..8103745 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator from pathlib import Path @@ -188,7 +188,7 @@ def ultimateReplace(app, docname, source): "$" + "{repository_name}": "echolocator", "$" + "{package_name}": "echolocator_lib", "$" + "{git_url}": "https://gitlab.diamond.ac.uk/xchem", - "$" + "{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 7a0fc0748e9d4eeca5ab2970380c2823 +# dae_devops_fingerprint 20b12f1e3c3fe99e0b1b302ef56d79fc diff --git a/pyproject.toml b/pyproject.toml index 5ae5382..41d1db8 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.1.dev0+g5d50877.d20230202. +# ********** It has been generated automatically by dae_devops version 0.5.1. # ********** For repository_name echolocator [build-system] @@ -11,7 +11,6 @@ name = "echolocator" 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_servbase", "dls_mainiac", "dls_utilpack"] 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", @@ -103,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 07b00a2f62eef686670dd135b59ce6b8 +# dae_devops_fingerprint 69fbb150408506fd907682cb5b2f8e24