Skip to content

Commit

Permalink
Merge pull request #142 from ral-facilities/DSEGOG-343-fix-formatting-ci
Browse files Browse the repository at this point in the history
DSEGOG-343 Fix black CI job not failing when it finds an issue
  • Loading branch information
moonraker595 authored Nov 20, 2024
2 parents a61d75e + 1ea05e6 commit 4bb91c3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ jobs:
key: ${{ runner.os }}-poetry-nox-black-${{ matrix.python-version }}-${{ env.pythonLocation }}-${{ hashFiles('poetry.lock') }}

- name: Run Nox black session
run: nox -s black
run: nox -s black -- --check --diff


safety:
Expand Down
5 changes: 2 additions & 3 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ def install_with_constraints(session, *args, **kwargs):

@nox.session(reuse_venv=True)
def black(session):
args = session.posargs or code_locations

args = session.posargs
install_with_constraints(session, "black")
session.run("black", *args, external=True)
session.run("black", *code_locations, *args, external=True)


@nox.session(reuse_venv=True)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ def __init__(
self.ingested_image = ingested_image or []
self.internal_failed_channel = internal_failed_channel or []

self.supported_channel_types = [
"scalar",
"image",
"rgb-image",
"waveform",
]
self.supported_channel_types = ["scalar", "image", "rgb-image", "waveform"]

def set_channels(self, manifest) -> None:
if not manifest:
Expand Down

0 comments on commit 4bb91c3

Please sign in to comment.