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 d897213 commit c75d7ef
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 23 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.9.1
rev: 24.1.1
hooks:
- id: black
language_version: python3.11

- repo: https://github.com/pycqa/flake8
rev: 6.1.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.32.0
rev: v1.33.0
hooks:
- id: yamllint
args:
Expand Down
1 change: 0 additions & 1 deletion edc_action_item/action_with_notification.py
Expand Up @@ -7,7 +7,6 @@


class ActionWithNotification(Action):

"""A class mixin for the Action class that adds
support for notifications.
"""
Expand Down
1 change: 0 additions & 1 deletion edc_action_item/forms/action_item_crf_form_mixin.py
Expand Up @@ -2,7 +2,6 @@


class ActionItemCrfFormMixin:

"""Declare with forms.ModelForm."""

class Meta:
Expand Down
2 changes: 0 additions & 2 deletions edc_action_item/forms/action_item_form_mixin.py
Expand Up @@ -2,7 +2,6 @@


class ActionItemFormMixin:

"""Declare with forms.ModelForm."""

class Meta:
Expand All @@ -14,7 +13,6 @@ class Meta:


class ActionItemCrfFormMixin:

"""Declare with forms.ModelForm."""

class Meta:
Expand Down
3 changes: 1 addition & 2 deletions edc_action_item/models/action_item.py
Expand Up @@ -30,8 +30,7 @@ class PrnModel(BaseUuidModel):
subject_identifier: str
...

class CrfModel(CrfModelMixin):
...
class CrfModel(CrfModelMixin): ...


class CurrentSiteManager(BaseCurrentSiteManager):
Expand Down
1 change: 0 additions & 1 deletion edc_action_item/models/reference.py
Expand Up @@ -14,7 +14,6 @@ def get_by_natural_key(self, action_identifier):


class Reference(NonUniqueSubjectIdentifierFieldMixin, ActionModelMixin, BaseUuidModel):

"""Model used as a default reference model for simple actions
not created by another model.
Expand Down
9 changes: 3 additions & 6 deletions edc_action_item/stubs.py
Expand Up @@ -15,8 +15,7 @@ def __init__(
related_action_item: Optional["ActionItemStub"] = None,
using: Optional[str] = None,
readonly: Optional[bool] = None,
) -> None:
...
) -> None: ...

name: str
action_item: "ActionItemStub"
Expand Down Expand Up @@ -52,11 +51,9 @@ class ActionItemStub(Protocol):

action_cls: ActionStub

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

def get_action_cls(self) -> Type[ActionStub]:
...
def get_action_cls(self) -> Type[ActionStub]: ...


class ActionItemWithNotificationStub(ActionItemStub, Protocol):
Expand Down
3 changes: 1 addition & 2 deletions edc_action_item/view_utils/action_item_popover_list_item.py
Expand Up @@ -19,8 +19,7 @@ class PrnModel(BaseUuidModel):
subject_identifier: str
...

class CrfModel(CrfModelMixin):
...
class CrfModel(CrfModelMixin): ...


@dataclass
Expand Down
1 change: 0 additions & 1 deletion edc_action_item/visit_schedule_mixin.py
Expand Up @@ -3,7 +3,6 @@


class VisitScheduleActionMixin:

"""A mixin for the Action class to add properties and
methods related to the visit schedule from
edc_visit_schedule.
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -35,7 +35,7 @@ exclude =
edc_action_item.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
Expand Down

0 comments on commit c75d7ef

Please sign in to comment.