Skip to content

Commit e76a4e8

Browse files
author
David Erb
committed
Merge branch 'mysql' into main
2 parents 3d8afdd + 830a30e commit e76a4e8

37 files changed

+293
-231
lines changed

‎.dae-devops/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ********** Please don't edit this file!
2-
# ********** It has been generated automatically by dae_devops version 0.5.2.
2+
# ********** It has been generated automatically by dae_devops version 0.5.3.
33
# ********** For repository_name dls-servbase
44

55
# ---------------------------------------------------------------------
@@ -69,4 +69,4 @@ publish_docs:
6969
cp -r build/html/* $(DOCS_PUBLISH_ROOT)
7070

7171

72-
# dae_devops_fingerprint dc970803af5fac409092e34299b9fa8a
72+
# dae_devops_fingerprint 7a40fdc6afce4991715aeda7ae70c444

‎.dae-devops/docs/conventions.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. # ********** Please don't edit this file!
2-
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
2+
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
33
.. # ********** For repository_name dls-servbase
44
55
Naming conventions
@@ -31,4 +31,4 @@ repository
3131
lowercase, hyphens
3232

3333

34-
.. # dae_devops_fingerprint de2f9c8adee74d13de393fe798054c9a
34+
.. # dae_devops_fingerprint cbd0a78343b6577aa4ddb9d59a242b04

‎.dae-devops/docs/developing.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. # ********** Please don't edit this file!
2-
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
2+
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
33
.. # ********** For repository_name dls-servbase
44
55
Developing
@@ -22,7 +22,6 @@ Make sure to have at least python version 3.9 then::
2222
Install the package in edit mode which will also install all its dependencies::
2323

2424
$ cd dls-servbase
25-
$ export PIP_FIND_LINKS=/dls_sw/apps/bxflow/artifacts
2625
$ pip install -e .[dev]
2726

2827
Now you may begin modifying the code.
@@ -36,4 +35,4 @@ If you plan to modify the docs, you will need to::
3635
3736

3837

39-
.. # dae_devops_fingerprint 85a9a86c29f573bd408647f7092b6fbe
38+
.. # dae_devops_fingerprint ac891cf352ef89b3b20d2c601dd9ddc4

‎.dae-devops/docs/devops.rst‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
.. # ********** Please don't edit this file!
2-
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
2+
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
33
.. # ********** For repository_name dls-servbase
44
55
Devops
66
=======================================================================
77

8-
There exists a a configuration file called ``.dae-devops/project.yaml``.
8+
In the top level of the repository there exists a configuration file called ``.dae-devops/project.yaml``.
99

1010
This file defines the project information needed for CI/CD.
1111

1212
It is parsed by the ``dae_devops.force`` command which creates these files:
1313

1414
- pyproject.toml
15+
- .githib/*
1516
- .gitlab-ci.yml
1617
- .dae-devops/Makefile
1718
- .dae-devops/docs/*
1819

1920
Local CI/CD execution
20-
-----------------------------------------------------------------------
21+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2122

2223
All the CI/CD ops which are run by the git server can be run at the command line.
2324

@@ -32,15 +33,15 @@ Validation of the code::
3233
$ make -f .dae-devops/Makefile validate_pytest
3334
$ make -f .dae-devops/Makefile validate_docs
3435

35-
Packaging::
36+
Packaging (for the Diamond intranet)::
3637

3738
$ make -f .dae-devops/Makefile package_pip
3839

39-
Publishing::
40+
Publishing (for the Diamond intranet)::
4041

4142
$ make -f .dae-devops/Makefile publish_pip
4243
$ make -f .dae-devops/Makefile publish_docs
4344
45+
The Diamond intranet commands are not used for production. The production packaging and publishing are handled in the GitHub Actions workflows mechanism.
4446

45-
46-
.. # dae_devops_fingerprint d203976f0fb58a25033c89155e85466e
47+
.. # dae_devops_fingerprint 84e8a32100211cbba64804a3e5c5b337

‎.dae-devops/docs/docs_structure.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. # ********** Please don't edit this file!
2-
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
2+
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
33
.. # ********** For repository_name dls-servbase
44
55
About the documentation
@@ -21,4 +21,4 @@ improve most documentation - often immensely.
2121

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

24-
.. # dae_devops_fingerprint 4c487ab610c69b04a69e018d6726347d
24+
.. # dae_devops_fingerprint 6ef08be920f12050c1c579cf6e9d4253

‎.dae-devops/docs/installing.rst‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. # ********** Please don't edit this file!
2-
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
2+
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
33
.. # ********** For repository_name dls-servbase
44
55
Installing
@@ -26,18 +26,17 @@ installation will not interfere with any existing Python software::
2626

2727
You can now use ``pip`` to install the library and its dependencies::
2828

29-
$ export PIP_FIND_LINKS=/dls_sw/apps/bxflow/artifacts
3029
$ python3 -m pip install dls-servbase
3130

3231
If you require a feature that is not currently released you can also install
3332
from git::
3433

3534
$ python3 -m pip install git+https://gitlab.diamond.ac.uk/kbp43231/dls-servbase.git
3635

37-
The library should now be installed and the commandline interface on your path.
36+
The library should now be installed and the commandline should be available.
3837
You can check the version that has been installed by typing::
3938

4039
$ dls-servbase --version
4140
$ dls-servbase --version-json
4241

43-
.. # dae_devops_fingerprint 4595ce95067039bcca5e2ff516cd03af
42+
.. # dae_devops_fingerprint 64d7ae0dde8939e479b9c793df928d15

‎.dae-devops/docs/testing.rst‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. # ********** Please don't edit this file!
2-
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
2+
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
33
.. # ********** For repository_name dls-servbase
44
55
Testing
@@ -11,17 +11,13 @@ If you want to run the tests, first get a copy of the code per the instructions
1111

1212
Then you can run all tests by::
1313

14-
$ pytest
15-
16-
Or this, which is the command used by the CI runner.
17-
18-
$ make -f .dae-devops/Makefile validate_pytest
14+
$ tox -q -e pytest
1915

2016
To run a single test you can do::
2117

2218
$ pytest tests/the_test_you_want.py
2319

24-
If you want to see more output of the test while it's running you can do:
20+
If you want to see more output of the test while it's running you can do::
2521

2622
$ pytest -sv -ra --tb=line tests/the_test_you_want.py
2723

@@ -35,4 +31,4 @@ This allows peeking in there to see what's been written by the test.
3531

3632

3733

38-
.. # dae_devops_fingerprint 6b049b05d346f33c50ff7c08811e9754
34+
.. # dae_devops_fingerprint 3bd80bbd88306473a1ee98b988b17986

‎.dae-devops/prepare_git_dependencies.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
# ********** Please don't edit this file!
4-
# ********** It has been generated automatically by dae_devops version 0.5.2.
4+
# ********** It has been generated automatically by dae_devops version 0.5.3.
55
# ********** For repository_name dls-servbase
66

77
me=${BASH_SOURCE}
@@ -13,4 +13,4 @@ function __install {
1313
}
1414

1515

16-
# dae_devops_fingerprint 903ed54702867ede6f0174cc61d4b713
16+
# dae_devops_fingerprint 663e11dbca4cdd5f84a218a64398a688

‎.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ********** Please don't edit this file!
2-
# ********** It has been generated automatically by dae_devops version 0.5.2.
2+
# ********** It has been generated automatically by dae_devops version 0.5.3.
33
# ********** For repository_name dls-servbase
44

55
# This file is for use as a devcontainer and a runtime container
@@ -40,4 +40,4 @@ ENV PATH=/venv/bin:$PATH
4040
ENTRYPOINT ["dls-servbase"]
4141
CMD ["--version"]
4242

43-
# dae_devops_fingerprint d98578ac4f9faec948660e9198138f35
43+
# dae_devops_fingerprint 80986671f8602f6e4666f78f98141826

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ********** Please don't edit this file!
2-
// ********** It has been generated automatically by dae_devops version 0.5.2.
2+
// ********** It has been generated automatically by dae_devops version 0.5.3.
33
// ********** For repository_name dls-servbase
44

55
// For format details, see https://containers.dev/implementors/json_reference/
@@ -57,4 +57,4 @@
5757
"postCreateCommand": "pip install -e .[dev]"
5858
}
5959

60-
// dae_devops_fingerprint a69fcd5d4332da3e6af3b97a7f171509
60+
// dae_devops_fingerprint 35358278c2556f05447815a0833301dc

0 commit comments

Comments
 (0)