Skip to content

Commit c4a2c8e

Browse files
author
David Erb
committed
removes cursor lock
1 parent e95c8d8 commit c4a2c8e

File tree

9 files changed

+159
-156
lines changed

9 files changed

+159
-156
lines changed

.dae-devops/docs/developing.rst

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ If you plan to make change to the code in this repository, you can use the steps
99

1010
Clone the repository::
1111

12+
$ cd <your development area>
1213
$ git clone https://gitlab.diamond.ac.uk/kbp43231/dls-normsql.git
1314

1415
It is recommended that you install into a virtual environment so this
1516
installation will not interfere with any existing Python software.
16-
Make sure to have at least python version 3.9 then::
17+
Make sure to have at least python version 3.10 then::
1718

1819
$ python3 -m venv /scratch/$USER/myvenv
1920
$ source /scratch/$USER/myvenv/bin/activate
@@ -22,17 +23,9 @@ Make sure to have at least python version 3.9 then::
2223
Install the package in edit mode which will also install all its dependencies::
2324

2425
$ cd dls-normsql
25-
$ pip install -e .[dev]
26+
$ pip install -e .[dev,docs]
2627

2728
Now you may begin modifying the code.
2829

29-
|
3030

31-
If you plan to modify the docs, you will need to::
32-
33-
$ pip install -e .[docs]
34-
35-
36-
37-
38-
.. # dae_devops_fingerprint 7b83e003f8bbbf54c27b4bd8141fb0e5
31+
.. # dae_devops_fingerprint b23d73dd4de218c9524358cf343938e7

.dae-devops/docs/documenting.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
.. # ********** Please don't edit this file!
2+
.. # ********** It has been generated automatically by dae_devops version 0.5.3.
3+
.. # ********** For repository_name dls-normsql
4+
5+
Documenting
6+
=======================================================================
7+
8+
If you plan to make update the documentation in this repository, you can use the steps below.
9+
10+
First, follow the steps in the Developing section to get a copy of the source code and install its dependencies.
11+
12+
If you didn't do this already, make sure you have the documentation tools::
13+
14+
$ cd <your development area>/dls-normsql
15+
$ pip install -e .[docs]
16+
17+
To produce the documentation locally::
18+
19+
$ tox -q -e docs
20+
21+
This writes the html into local directory build/html. You can browse the local documentation by::
22+
23+
file:///<your development area>/dls-normsql/build/html/index.html
24+
25+
When you push either the main branch or a tag to GitHub, the documents are built and published automatically to this url::
26+
27+
https://diamondlightsource.github.io/dls-normsql/main/index.html
28+
29+
30+
.. # dae_devops_fingerprint 2e96ce2e1701d5674aa92004b95cb6dd

.dae-devops/docs/installing.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ Installing
66
=======================================================================
77

88

9-
You will need python 3.9 or later.
9+
You will need python 3.10 or later.
1010

11-
On a Diamond Light Source internal computer, you can achieve Python 3.9 by::
11+
On a Diamond Light Source internal computer, you can achieve Python 3.10 by::
1212

13-
$ module load python/3.9
13+
$ module load python/3.10
1414

1515
You can check your version of python by typing into a terminal::
1616

@@ -24,19 +24,19 @@ installation will not interfere with any existing Python software::
2424
$ pip install --upgrade pip
2525

2626

27-
You can now use ``pip`` to install the library and its dependencies::
27+
You can now use ``pip`` to install the package and its dependencies::
2828

2929
$ python3 -m pip install dls-normsql
3030

31-
If you require a feature that is not currently released you can also install
31+
If you require a feature that is not currently released, you can also install
3232
from git::
3333

3434
$ python3 -m pip install git+https://gitlab.diamond.ac.uk/kbp43231/dls-normsql.git
3535

36-
The library should now be installed and the commandline should be available.
36+
The package should now be installed and the command line should be available.
3737
You can check the version that has been installed by typing::
3838

3939
$ dls-normsql --version
4040
$ dls-normsql --version-json
4141

42-
.. # dae_devops_fingerprint a2fe8dfbc79c151a5b899b244a529aa6
42+
.. # dae_devops_fingerprint d972d49fe32bcad19880f2817fed8fae

.dae-devops/docs/testing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ If you want to see more output of the test while it's running you can do::
2323

2424
Each test will write files into its own directory::
2525

26-
/tmp/dls-normsql/tests/....
26+
/tmp/dls-normsql/tests/*
2727

2828
The tests clear their directory when they start, but not when they finish.
29-
This allows peeking in there to see what's been written by the test.
29+
This allows you to examine what's been written by the test.
3030

3131

3232

3333

34-
.. # dae_devops_fingerprint 1801aaf6bd998d192c9fb4cdd6c3e79f
34+
.. # dae_devops_fingerprint 69544ab25d1fea250e99af1cf0c84506

.github/workflows/code.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ jobs:
4141
os: ["ubuntu-latest"] # can add windows-latest, macos-latest
4242
python: ["3.10"]
4343
install: ["-e .[dev,docs]"]
44-
# Make one version be non-editable to test both paths of version code
45-
include:
46-
- os: "ubuntu-latest"
47-
python: "3.9"
48-
install: ".[dev,docs]"
4944

5045
runs-on: ${{ matrix.os }}
5146
env:
@@ -216,4 +211,4 @@ jobs:
216211
with:
217212
password: ${{ secrets.PYPI_TOKEN }}
218213

219-
# dae_devops_fingerprint d13e8289ca6252679ab7d9ae8db75617
214+
# dae_devops_fingerprint a23991a7d28e20d040902bf8d1aa4541

docs/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
# If true, Sphinx will warn about all references where the target cannot
5757
# be found.
58-
nitpicky = True
58+
nitpicky = False
5959

6060
# A list of (type, target) tuples (by default empty) that should be ignored when
6161
# generating warnings in "nitpicky mode". Note that type should include the
@@ -188,7 +188,7 @@ def ultimateReplace(app, docname, source):
188188
"$" + "{repository_name}": "dls-normsql",
189189
"$" + "{package_name}": "dls_normsql",
190190
"$" + "{git_url}": "https://gitlab.diamond.ac.uk/kbp43231",
191-
"$" + "{python_version_at_least}": "3.9",
191+
"$" + "{python_version_at_least}": "3.10",
192192
}
193193

194194

@@ -197,4 +197,4 @@ def setup(app):
197197
app.connect("source-read", ultimateReplace)
198198

199199

200-
# dae_devops_fingerprint cd8b8b6c6077d960c9ed6af1579909b3
200+
# dae_devops_fingerprint 0afc2bceebf806891327ed822e2760a9

pyproject.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@ name = "dls-normsql"
1111
classifiers = [
1212
"Development Status :: 3 - Alpha",
1313
"License :: OSI Approved :: Apache Software License",
14-
"Programming Language :: Python :: 3.9",
1514
"Programming Language :: Python :: 3.10",
16-
"Programming Language :: Python :: 3.11",
1715
]
1816
description = "Normalized API over various sql libraries."
1917
dependencies = ["dls-utilpack", "aiosqlite", "aiomysql", "cryptography"]
2018
dynamic = ["version"]
2119
license.file = "LICENSE"
22-
readme = "README.rst"
23-
requires-python = ">=3.9"
20+
readme = "README.md"
21+
requires-python = ">=3.10"
2422

2523
[project.optional-dependencies]
2624
dev = [
@@ -102,4 +100,4 @@ source = ["src", "**/site-packages/"]
102100
[tool.tox]
103101
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"
104102

105-
# dae_devops_fingerprint ecc6232348dbe2bd0e46bde0c1961e3b
103+
# dae_devops_fingerprint df8767613c8b867ee1ddb91dd8b71fca

0 commit comments

Comments
 (0)