Skip to content

Commit

Permalink
Bump pre-commit repos, run through Black 24.1.1
Browse files Browse the repository at this point in the history
Black changes witnessed (mainly) include:
- addition of blank line between module docstrings and imports
- removal of blank lines between class declarations and docstrings
- prefer splitting assignment statements on right-hand side
- wrap conditional expressions that span multiple lines in parens
- put `...` in stubs on same line
- add E701 and E704 to flake8 ignore list, see:
    - https://github.com/psf/black/blob/main/docs/guides/using_black_with_other_tools.md#e701--e704
    - psf/black#3887 (E704)
    - psf/black#4173 (E701)
  • Loading branch information
JonathanWillitts committed Feb 2, 2024
1 parent 8d19e7c commit 778169b
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 22 deletions.
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Expand Up @@ -3,32 +3,32 @@ exclude: tests/etc/user-*

repos:
- repo: https://github.com/PyCQA/bandit
rev: 1.7.5
rev: 1.7.7
hooks:
- id: bandit
args:
- "-x *test*.py"

- repo: https://github.com/psf/black
rev: 23.3.0
rev: 24.1.1
hooks:
- id: black
language_version: python3.10

- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 7.0.0
hooks:
- id: flake8
args:
- "--config=setup.cfg"

- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: requirements-txt-fixer
files: requirements/.*\.txt$
Expand All @@ -42,7 +42,7 @@ repos:
- id: detect-private-key

- repo: https://github.com/adrienverge/yamllint
rev: v1.31.0
rev: v1.33.0
hooks:
- id: yamllint
args:
Expand Down
Expand Up @@ -2,7 +2,6 @@


class SubjectOnScheduleModelMixin(models.Model):

"""A model mixin for a consent or other model
that when saved updates a subject to be `on schedule`.
Expand Down
Expand Up @@ -11,7 +11,6 @@ class VisitScheduleModelMixin(
VisitScheduleMethodsModelMixin,
models.Model,
):

"""A model mixin for Appointment and related (subject) visit models.
A model mixin that adds field attributes and methods that
Expand Down
1 change: 0 additions & 1 deletion edc_visit_schedule/models/offschedule.py
Expand Up @@ -5,7 +5,6 @@


class OffSchedule(SiteModelMixin, OffScheduleModelMixin, BaseUuidModel):

"""A model used by the system. Records a subject as no longer on
a schedule.
"""
Expand Down
1 change: 0 additions & 1 deletion edc_visit_schedule/models/onschedule.py
Expand Up @@ -5,7 +5,6 @@


class OnSchedule(SiteModelMixin, OnScheduleModelMixin, BaseUuidModel):

"""A model used by the system. Auto-completed by subject_consent."""

class Meta(OnScheduleModelMixin.Meta, BaseUuidModel.Meta):
Expand Down
1 change: 0 additions & 1 deletion edc_visit_schedule/tests/dummy_panel.py
@@ -1,5 +1,4 @@
class DummyPanel:

"""A dummy lab panel object."""

def __init__(self, name=None, verbose_name=None, requisition_model=None):
Expand Down
12 changes: 4 additions & 8 deletions edc_visit_schedule/typing_stubs.py
Expand Up @@ -2,14 +2,10 @@


class VisitScheduleFieldsProtocol(Protocol):
def visit_code(self) -> str:
...
def visit_code(self) -> str: ...

def visit_code_sequence(self) -> int:
...
def visit_code_sequence(self) -> int: ...

def visit_schedule_name(self) -> str:
...
def visit_schedule_name(self) -> str: ...

def schedule_name(self) -> str:
...
def schedule_name(self) -> str: ...
3 changes: 1 addition & 2 deletions edc_visit_schedule/view_mixins.py
Expand Up @@ -12,8 +12,7 @@
from .schedule import Schedule
from .visit_schedule import VisitSchedule

class OnScheduleLikeModel(OnScheduleModelMixin):
...
class OnScheduleLikeModel(OnScheduleModelMixin): ...


class VisitScheduleViewMixin:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -35,7 +35,7 @@ exclude =
edc_visit_schedule.tests*

[flake8]
ignore = E226,W503,E203
ignore = E226,W503,E203,E701,E704
max-line-length = 95
max-complexity = 10
exclude = */migrations/*,.tox,.git,__pycache__,build,dist,.eggs,_version.py
Expand Down

0 comments on commit 778169b

Please sign in to comment.