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

Commit

Permalink
Remove trailing spaces and rationalise newlines
Browse files Browse the repository at this point in the history
Some tools remove trailing whitespace by default on save, so may as well
correct the originals.
Ensures every file ends with an empty blank line. Again some tools do
this automatically.
  • Loading branch information
AlexanderWells-diamond authored and coretl committed Sep 1, 2023
1 parent 3415f1c commit 5536081
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 19 deletions.
1 change: 0 additions & 1 deletion .github/actions/install_requirements/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,3 @@ runs:
fi
fi
shell: bash

2 changes: 1 addition & 1 deletion .github/pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
<link rel="canonical" href="main/index.html">
</head>

</html>
</html>
2 changes: 1 addition & 1 deletion .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
run: tox -e docs build -- -b linkcheck

- name: Keepalive Workflow
uses: gautamkrishnar/keepalive-workflow@v1
uses: gautamkrishnar/keepalive-workflow@v1
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,3 @@ venv*

# further build artifacts
lockfiles/

2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"redhat.vscode-yaml",
"ryanluker.vscode-coverage-gutters"
]
}
}
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
},
}
]
}
}
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
"problemMatcher": [],
}
]
}
}
2 changes: 1 addition & 1 deletion docs/developer/how-to/build-docs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ changes in this directory too::

$ tox -e docs autobuild -- --watch src

.. _sphinx: https://www.sphinx-doc.org/
.. _sphinx: https://www.sphinx-doc.org/
2 changes: 0 additions & 2 deletions docs/developer/how-to/lint.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,3 @@ VSCode support

The ``.vscode/settings.json`` will run black and isort formatters as well as
flake8 checking on save. Issues will be highlighted in the editor window.


2 changes: 1 addition & 1 deletion docs/developer/how-to/make-release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ To make a new release, please follow this checklist:
Note that tagging and pushing to the main branch has the same effect except that
you will not get the option to edit the release notes.

.. _release: https://github.com/DiamondLightSource/python3-pip-skeleton/releases
.. _release: https://github.com/DiamondLightSource/python3-pip-skeleton/releases
2 changes: 1 addition & 1 deletion docs/developer/reference/standards.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ Docs follow the underlining convention::

.. seealso::

How-to guide `../how-to/build-docs`
How-to guide `../how-to/build-docs`
10 changes: 5 additions & 5 deletions docs/developer/tutorials/dev-install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ requires python 3.8 or later) or to run in a container under `VSCode
$ code python3-pip-skeleton
# Click on 'Reopen in Container' when prompted
# Open a new terminal
.. note::
See the epics-containers_ documentation for more complex
.. note::

See the epics-containers_ documentation for more complex
use cases, such as integration with podman.

See what was installed
Expand All @@ -65,4 +65,4 @@ This will run in parallel the following checks:
- `../how-to/lint`


.. _epics-containers: https://epics-containers.github.io/main/user/tutorials/devcontainer.html
.. _epics-containers: https://epics-containers.github.io/main/user/tutorials/devcontainer.html
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ skipsdist=True
# Don't create a virtualenv for the command, requires tox-direct plugin
direct = True
passenv = *
allowlist_externals =
pytest
allowlist_externals =
pytest
pre-commit
mypy
sphinx-build
Expand Down

0 comments on commit 5536081

Please sign in to comment.