Skip to content

Commit

Permalink
new black version
Browse files Browse the repository at this point in the history
  • Loading branch information
David Erb committed Feb 28, 2023
1 parent 24366a7 commit c52b90f
Show file tree
Hide file tree
Showing 23 changed files with 59 additions and 59 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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

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


# dae_devops_fingerprint 833a6052cf5f50d0079c389bbfa591fd
# dae_devops_fingerprint d63e047529404daf652476f24688ea34
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.4.0.
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
.. # ********** For repository_name dls-utilpack
Naming conventions
Expand Down Expand Up @@ -31,4 +31,4 @@ repository
lowercase, hyphens


.. # dae_devops_fingerprint b3558c0e136c864dc9d0f9afc11a04f9
.. # dae_devops_fingerprint 8dbc3a8375bfa18c5de367f43e940baa
6 changes: 3 additions & 3 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.4.0.
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
.. # ********** For repository_name dls-utilpack
Developing
Expand All @@ -13,7 +13,7 @@ Clone the repository::

It is recommended that you install into a virtual environment so this
installation will not interfere with any existing Python software.
Make sure to have at least python version 3.8 then::
Make sure to have at least python version 3.9 then::

$ python3 -m venv /scratch/$USER/myvenv
$ source /scratch/$USER/myvenv/bin/activate
Expand All @@ -36,4 +36,4 @@ If you plan to modify the docs, you will need to::


.. # dae_devops_fingerprint 5cb1fdfc440046b137c8255a1d96c480
.. # dae_devops_fingerprint 10795db3a0e161045debf0c89348bb24
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.4.0.
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
.. # ********** For repository_name dls-utilpack
Devops
Expand Down Expand Up @@ -43,4 +43,4 @@ Publishing::


.. # dae_devops_fingerprint 50bdf0d4190273f50b3aa4174dc3ac3f
.. # dae_devops_fingerprint d2bca688da0d1b2a93392bca1d74bcf9
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.4.0.
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
.. # ********** For repository_name dls-utilpack
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 18fec62d94dbce9a330676b9abc31fd9
.. # dae_devops_fingerprint df17fb0c73cb2f5162b27c5689074969
10 changes: 5 additions & 5 deletions .dae-devops/docs/installing.rst
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.. # ********** Please don't edit this file!
.. # ********** It has been generated automatically by dae_devops version 0.4.0.
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
.. # ********** For repository_name dls-utilpack
Installing
=======================================================================


You will need python 3.8 or later.
You will need python 3.9 or later.

On a Diamond Light Source internal computer, you can achieve Python 3.8 by::
On a Diamond Light Source internal computer, you can achieve Python 3.9 by::

$ module load python/3.8
$ module load python/3.9

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

Expand Down Expand Up @@ -40,4 +40,4 @@ You can check the version that has been installed by typing::
$ dls-utilpack --version
$ dls-utilpack --version-json

.. # dae_devops_fingerprint 3fa22d7148c64ac933cb47eaf77d77e6
.. # dae_devops_fingerprint fa480c2e4f59a68b0ef91bf12e5f6b58
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.4.0.
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
.. # ********** For repository_name dls-utilpack
Testing
Expand Down Expand Up @@ -35,4 +35,4 @@ This allows peeking in there to see what's been written by the test.



.. # dae_devops_fingerprint 6b1f132b576b9ae76b385016f7c0a1bd
.. # dae_devops_fingerprint 17ae8c603ffe73c0fbdfcda48e7881bb
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

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


# dae_devops_fingerprint adf670ea8d6c81160879488aaba2c112
# dae_devops_fingerprint 4e341ec615d392fd3f44c8c01eaa8fbd
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

# 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-utilpack"]
CMD ["--version"]

# dae_devops_fingerprint eb9e2d96b111d0da28a734ed432a84d8
# dae_devops_fingerprint 29e344c513daf6f125ee4e8388a06736
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.4.0.
// ********** It has been generated automatically by dae_devops version 0.5.2.
// ********** For repository_name dls-utilpack

// 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 46cf13a33c13acc57aca31d4c7426ab8
// dae_devops_fingerprint 6f0e3415b3a297d5ce22f28b8dfbbd23
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.4.0.
.. # ********** It has been generated automatically by dae_devops version 0.5.2.
.. # ********** For repository_name dls-utilpack
Contributing to the project
Expand Down Expand Up @@ -38,4 +38,4 @@ should follow.

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

.. # dae_devops_fingerprint 0c22debce21f402692fce6d5883ccf2c
.. # dae_devops_fingerprint e29f699b807ff29198e97d0163468ccd
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

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


# dae_devops_fingerprint 612a1630957abb1779ff0e2dd4f672c5
# dae_devops_fingerprint ef652e9abab51b9fbb68a1010da09af7
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

# 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 8c6ee06285ccf5c33e6bdef4f6d43cdc
# dae_devops_fingerprint 9ddfc76e95e202063eea84301051a6f9
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.4.0. -->
<!-- ********** It has been generated automatically by dae_devops version 0.5.2. -->
<!-- ********** For repository_name dls-utilpack -->

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

</html>

<!-- dae_devops_fingerprint ca3806d342f68f751e92197b25b5a74b -->
<!-- dae_devops_fingerprint 614caf0e41ded120646f87637c4e8aa1 -->
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

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

# dae_devops_fingerprint 243424585635b0082287350b3ce8e63b
# dae_devops_fingerprint 9de9ab0e7e88db7736d4bdc5b33bfe89
12 changes: 6 additions & 6 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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

name: Code CI
Expand Down Expand Up @@ -39,12 +39,12 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest"] # can add windows-latest, macos-latest
python: ["3.9", "3.10", "3.11"]
python: ["3.10", "3.11"]
install: ["-e .[dev,docs]"]
# Make one version be non-editable to test both paths of version code
include:
- os: "ubuntu-latest"
python: "3.8"
python: "3.9"
install: ".[dev,docs]"

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:

- name: Test module --version works using the installed wheel
# If more than one module in src/ replace with module name to test
run: python -m $(ls src | grep -v egg-info | head -1) --version
run: dls-utilpack --version-json

container:
needs: [lint, dist, test]
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
- name: Github Release
# We pin to the SHA, not the tag, for security reasons.
# https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v0.1.14
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
with:
prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
files: |
Expand All @@ -212,4 +212,4 @@ jobs:
with:
password: ${{ secrets.PYPI_TOKEN }}

# dae_devops_fingerprint f051e2d0b0a34c4a8593c9e0436087ec
# dae_devops_fingerprint 97cce24d579fe2cf6cc302e06dbd4836
6 changes: 3 additions & 3 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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

name: Docs CI
Expand Down Expand Up @@ -50,10 +50,10 @@ jobs:
if: github.event_name == 'push' && github.actor != 'dependabot[bot]'
# We pin to the SHA, not the tag, for security reasons.
# https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
uses: peaceiris/actions-gh-pages@de7ea6f8efb354206b205ef54722213d99067935 # v3.9.0
uses: peaceiris/actions-gh-pages@bd8c6b06eba6b3d25d72b7a1767993c0aeee42e7 # v3.9.2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: .github/pages
keep_files: true

# dae_devops_fingerprint 6a2c949632bcc85eeaeb4f9f1b0d0c05
# dae_devops_fingerprint 23b156a03b2f52b3c08ea9d4f6e622db
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

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 4c653a44b0b30d75898072e9b50e916b
# dae_devops_fingerprint 6906b07d0aafb39f92a25b57699a6cdd
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

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 119d3e41fdf8be74e2b16f094a7fa363
# dae_devops_fingerprint 7e1bfd21182cf87c73f3bdc1e1bf9044
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

variables:
Expand Down Expand Up @@ -89,4 +89,4 @@ package_pip:
# # The validate_docs artifacts are in the build/html folder.
# - make -f .dae-devops/Makefile publish_docs

# dae_devops_fingerprint a0405727c4277c12cce2198b0ece3750
# dae_devops_fingerprint 8d2d1323dcc73040d4e9d57e50ec8fdc
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.4.0. */
/* ********** It has been generated automatically by dae_devops version 0.5.2. */
/* ********** For repository_name dls-utilpack */

/* 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 04b3e064d058bd93088ff7c7c987bbbd */
/* dae_devops_fingerprint 04ccbfb5cc0df02e50da41cd4f7ac238 */
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.4.0.
# ********** It has been generated automatically by dae_devops version 0.5.2.
# ********** For repository_name dls-utilpack

from pathlib import Path
Expand Down Expand Up @@ -188,7 +188,7 @@ def ultimateReplace(app, docname, source):
"$" + "{repository_name}": "dls-utilpack",
"$" + "{package_name}": "dls_utilpack",
"$" + "{git_url}": "https://gitlab.diamond.ac.uk/scisoft",
"$" + "{python_version_at_least}": "3.8",
"$" + "{python_version_at_least}": "3.9",
}


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


# dae_devops_fingerprint 15d7a62ee5b6d2187af4e3cd3f5b1709
# dae_devops_fingerprint 82dcaf368fc09480cbf4ba8fbc9487b9
Loading

0 comments on commit c52b90f

Please sign in to comment.