Skip to content

Commit

Permalink
new devops
Browse files Browse the repository at this point in the history
  • Loading branch information
David Erb committed Jun 7, 2023
1 parent 499e873 commit 250a73c
Show file tree
Hide file tree
Showing 25 changed files with 49 additions and 50 deletions.
4 changes: 2 additions & 2 deletions .dae-devops/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

# ---------------------------------------------------------------------
Expand Down Expand Up @@ -69,4 +69,4 @@ publish_docs:
cp -r build/html/* $(DOCS_PUBLISH_ROOT)


# dae_devops_fingerprint 2d453caef2662f6d4cfd06d459312f02
# dae_devops_fingerprint 7a40fdc6afce4991715aeda7ae70c444
4 changes: 2 additions & 2 deletions .dae-devops/docs/conventions.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
.. # ********** For repository_name dls-servbase
Naming conventions
Expand Down Expand Up @@ -31,4 +31,4 @@ repository
lowercase, hyphens


.. # dae_devops_fingerprint 377aec0d2a3859ddaaadcf7d54438742
.. # dae_devops_fingerprint cbd0a78343b6577aa4ddb9d59a242b04
4 changes: 2 additions & 2 deletions .dae-devops/docs/developing.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
.. # ********** For repository_name dls-servbase
Developing
Expand Down Expand Up @@ -28,4 +28,4 @@ Install the package in edit mode which will also install all its dependencies::
Now you may begin modifying the code.


.. # dae_devops_fingerprint 0fd7e3e20b23c566fad722262ab9f97a
.. # dae_devops_fingerprint 382b21157de1abc87034e692cbcabaf2
4 changes: 2 additions & 2 deletions .dae-devops/docs/devops.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
.. # ********** For repository_name dls-servbase
Devops
Expand Down Expand Up @@ -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 e8dff03fd491f40bda262817af6bf646
.. # dae_devops_fingerprint 84e8a32100211cbba64804a3e5c5b337
4 changes: 2 additions & 2 deletions .dae-devops/docs/docs_structure.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
.. # ********** For repository_name dls-servbase
About the documentation
Expand All @@ -21,4 +21,4 @@ improve most documentation - often immensely.

`More information on this topic. <https://documentation.divio.com>`_

.. # dae_devops_fingerprint 505d623863ca025fcddb20fe31db39d4
.. # dae_devops_fingerprint 6ef08be920f12050c1c579cf6e9d4253
4 changes: 2 additions & 2 deletions .dae-devops/docs/documenting.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
.. # ********** For repository_name dls-servbase
Documenting
Expand Down Expand Up @@ -27,4 +27,4 @@ When you push either the main branch or a tag to GitHub, the documents are built
https://diamondlightsource.github.io/dls-servbase/main/index.html


.. # dae_devops_fingerprint 850546fd7c3118fca1955e370bee4fc6
.. # dae_devops_fingerprint d453f7183dae2edc0cf03aec47ef5c36
4 changes: 2 additions & 2 deletions .dae-devops/docs/installing.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
.. # ********** For repository_name dls-servbase
Installing
Expand Down Expand Up @@ -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 f5c12f1646c65db4968cb1f7cc1306d0
.. # dae_devops_fingerprint b97a5d420f58e39a53c0a12e14d49e59
4 changes: 2 additions & 2 deletions .dae-devops/docs/testing.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
.. # ********** For repository_name dls-servbase
Testing
Expand Down Expand Up @@ -31,4 +31,4 @@ This allows you to examine what's been written by the test.



.. # dae_devops_fingerprint 197b7a99ae5cd1520d710ad36ebd4236
.. # dae_devops_fingerprint 139490d56d4a834f3de38d7da4db71bb
4 changes: 2 additions & 2 deletions .dae-devops/prepare_git_dependencies.sh
Original file line number Diff line number Diff line change
@@ -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.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

me=${BASH_SOURCE}
Expand All @@ -13,4 +13,4 @@ function __install {
}


# dae_devops_fingerprint a12ea0ce18dbb5ec2a10162f22bba2dd
# dae_devops_fingerprint 663e11dbca4cdd5f84a218a64398a688
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** 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
Expand Down Expand Up @@ -40,4 +40,4 @@ ENV PATH=/venv/bin:$PATH
ENTRYPOINT ["dls-servbase"]
CMD ["--version"]

# dae_devops_fingerprint 0534faa0b5641c6bf5a6865dc868c633
# dae_devops_fingerprint 80986671f8602f6e4666f78f98141826
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ********** Please don't edit this file!
// ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
// ********** 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/
Expand Down Expand Up @@ -57,4 +57,4 @@
"postCreateCommand": "pip install -e .[dev]"
}

// dae_devops_fingerprint 41cc023010f4dbc2a199785da970798f
// dae_devops_fingerprint 35358278c2556f05447815a0833301dc
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
.. # ********** For repository_name dls-servbase
Contributing to the project
Expand Down Expand Up @@ -38,4 +38,4 @@ should follow.

.. _Developer Guide: https://diamondlightsource.github.io/dls-servbase/main/developer/how-to/contribute.html

.. # dae_devops_fingerprint 5554a59e62e5009c44a967ba6a56e3ea
.. # dae_devops_fingerprint 0f4cbc1f77b787f03a9a4d268ed08055
4 changes: 2 additions & 2 deletions .github/actions/install_requirements/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

name: Install requirements
Expand Down Expand Up @@ -61,4 +61,4 @@ runs:
shell: bash


# dae_devops_fingerprint 967212425bc2c65a1fcab3e8aaacd538
# dae_devops_fingerprint 492458ca501cde9a298a80a102ff22a4
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** 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
Expand All @@ -19,4 +19,4 @@ updates:
schedule:
interval: "weekly"

# dae_devops_fingerprint f3e273cc476ab516308a7a53ad8e30c6
# dae_devops_fingerprint b5838c5e0d9b5041500c5cb701fb5e5b
4 changes: 2 additions & 2 deletions .github/pages/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- ********** Please don't edit this file! -->
<!-- ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527. -->
<!-- ********** It has been generated automatically by dae_devops version 0.5.3. -->
<!-- ********** For repository_name dls-servbase -->

<!DOCTYPE html>
Expand All @@ -14,4 +14,4 @@

</html>

<!-- dae_devops_fingerprint ce91bbc76dad4f75ab7e37720e20fd5e -->
<!-- dae_devops_fingerprint f42d18d6994629b2878c5e7336501264 -->
4 changes: 2 additions & 2 deletions .github/pages/make_switcher.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

import json
Expand Down Expand Up @@ -102,4 +102,4 @@ def main(args=None):
if __name__ == "__main__":
main()

# dae_devops_fingerprint b0c90a9621cff9b99133ac54ac310ade
# dae_devops_fingerprint 7a1b58b851c5198d7d380e4ab78d0b49
4 changes: 2 additions & 2 deletions .github/workflows/code.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

name: Code CI
Expand Down Expand Up @@ -211,4 +211,4 @@ jobs:
with:
password: ${{ secrets.PYPI_TOKEN }}

# dae_devops_fingerprint 20cc3e951a4652adfe1bdb16f0746054
# dae_devops_fingerprint 66f0e76ce29e7f64d1ef000bebeb3d8b
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

name: Docs CI
Expand Down Expand Up @@ -56,4 +56,4 @@ jobs:
publish_dir: .github/pages
keep_files: true

# dae_devops_fingerprint e20397fc0e4761c7e1a235ec1ea95642
# dae_devops_fingerprint fb2dde86086783119d0b0b805151bf09
4 changes: 2 additions & 2 deletions .github/workflows/docs_clean.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

name: Docs Cleanup CI
Expand Down Expand Up @@ -46,4 +46,4 @@ jobs:
git commit -am "Removing redundant docs version $DOCS_VERSION"
git push
# dae_devops_fingerprint 1f0958e89021d3ef04512fb059911cf4
# dae_devops_fingerprint d46d59a6f5197bd11b1cece615feb4df
4 changes: 2 additions & 2 deletions .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

name: Link Check
Expand Down Expand Up @@ -27,4 +27,4 @@ jobs:
- name: Check links
run: tox -e docs build -- -b linkcheck

# dae_devops_fingerprint e216c0f0a9289fde8ba359d4162660ac
# dae_devops_fingerprint 0198bfb9fadda488379138f6b2e7f5e3
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

variables:
Expand Down Expand Up @@ -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 8c0d6830168b3a593396882beae5df6a
# dae_devops_fingerprint 814043c19b1379f7f1d7b188546a7734
4 changes: 2 additions & 2 deletions docs/_static/css/custom.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* ********** Please don't edit this file! */
/* ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527. */
/* ********** 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.
Expand All @@ -15,4 +15,4 @@
max-width: 100%;
}

/* dae_devops_fingerprint 23a2c19a90d7774253a8b9da412cf9f2 */
/* dae_devops_fingerprint b94b4f0075614442e536fdd79bcf79f7 */
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

from pathlib import Path
Expand Down Expand Up @@ -55,7 +55,7 @@

# If true, Sphinx will warn about all references where the target cannot
# be found.
nitpicky = True
nitpicky = False

# A list of (type, target) tuples (by default empty) that should be ignored when
# generating warnings in "nitpicky mode". Note that type should include the
Expand Down Expand Up @@ -197,4 +197,4 @@ def setup(app):
app.connect("source-read", ultimateReplace)


# dae_devops_fingerprint a8d7b8d65abc276648e440edf32e0454
# dae_devops_fingerprint 6878b6b3f698c9be231083d88755956e
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ********** Please don't edit this file!
# ********** It has been generated automatically by dae_devops version 0.5.4.dev0+g1fb30ef.d20230527.
# ********** It has been generated automatically by dae_devops version 0.5.3.
# ********** For repository_name dls-servbase

[build-system]
Expand Down Expand Up @@ -100,4 +100,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 cde1577a97f0e28d7fd63100e14d53ab
# dae_devops_fingerprint 25ba8f378cc5e02106bf918889322274
1 change: 0 additions & 1 deletion tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

from dls_servbase_api.databases.constants import CookieFieldnames, Tablenames
from dls_servbase_api.datafaces.context import Context as ClientContext
from dls_servbase_api.datafaces.datafaces import dls_servbase_datafaces_get_default

# Base class for the tester.
from tests.base_context_tester import BaseContextTester
Expand Down

0 comments on commit 250a73c

Please sign in to comment.