Skip to content
This repository was archived by the owner on Mar 13, 2024. It is now read-only.

Commit e828c51

Browse files
committed
tidy docs
1 parent f12450e commit e828c51

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{
77
"type": "shell",
88
"label": "Tests with coverage",
9-
"command": "pipenv run tests",
9+
"command": "tox -e pytest",
1010
"options": {
1111
"cwd": "${workspaceRoot}"
1212
},

CONTRIBUTING.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ on your workstation as follows::
3939

4040
In both cases tox -p runs in parallel the following checks:
4141

42-
- Build Spinx Documentation
42+
- Build Sphinx Documentation
4343
- run pytest on all tests in ./tests
4444
- run mypy linting on all files in ./src ./tests
4545
- run pre-commit checks:
@@ -126,10 +126,14 @@ Release Process
126126
To make a new release, please follow this checklist:
127127

128128
- Choose a new PEP440 compliant release number
129-
- Git tag the version
130-
- Push to GitHub and the actions will make a release on pypi
131-
- Push to internal gitlab and do a dls-release.py of the tag
132-
- Check and edit for clarity the autogenerated GitHub release_
129+
- Go to the GitHub release_ page
130+
- Choose ``Draft New Release``
131+
- Click ``Choose Tag`` and supply the new tag you chose (click create new tag)
132+
- Click ``Generate release notes``, review and edit these notes
133+
- Choose a title and click ``Publish Release``
134+
135+
Note that tagging and pushing to the main branch has the same effect except that
136+
you will not get the option to edit the release notes.
133137

134138
.. _release: https://github.com/epics-containers/python3-pip-skeleton/releases
135139

@@ -149,7 +153,7 @@ Python project structure which provides a means to keep tools and
149153
techniques in sync between multiple Python projects. To update to the
150154
latest version of the skeleton, run::
151155

152-
$ git pull https://github.com/dls-controls/python3-pip-skeleton skeleton
156+
$ git pull https://github.com/dls-controls/python3-pip-skeleton main
153157

154158
Any merge conflicts will indicate an area where something has changed that
155159
conflicts with the setup of the current module. Check the `closed pull requests

README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ python3-pip-skeleton
99
adopt this skeleton project see
1010
https://epics-containers.github.io/python3-pip-skeleton-cli
1111

12+
[Remove this note when adopting skeleton.]
13+
1214
This is where you should write a short paragraph that describes what your module does,
1315
how it does it, and why people should use it.
1416

docs/tutorials/installation.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
Installation
22
============
33

4-
.. note::
5-
6-
For installation inside DLS, please see the internal documentation on
7-
``dls-python3`` and ``pipenv``. Although these instructions will work
8-
inside DLS, they are intended for external use.
9-
10-
If you want to contribute to the library itself, please follow
11-
the `../how-to/contributing` instructions.
12-
13-
144
Check your version of python
155
----------------------------
166

0 commit comments

Comments
 (0)