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 dfa5a67 commit 4adedef
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
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_model/models/base_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@


class BaseModel(UrlModelMixin, AuditModelMixin, models.Model):

"""Base model class for all EDC models. Adds created and modified'
values for user, date and hostname (computer).
"""
Expand Down
2 changes: 0 additions & 2 deletions edc_model/models/fields/date_estimated.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@


class IsDateEstimatedField(CharField):

"""field to question if date is estimated"""

description = _("Custom field to question if date is estimated")
Expand All @@ -28,7 +27,6 @@ def get_internal_type(self):


class IsDateEstimatedFieldNa(CharField):

"""field to question if date is estimated"""

description = _("Custom field to question if date is estimated")
Expand Down
1 change: 0 additions & 1 deletion edc_model/models/fields/identity_type_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class IdentityTypeField(CharField):

"""
have IdentityTypeField immediately follow an identity field:
Expand Down
9 changes: 3 additions & 6 deletions edc_model/stubs.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,15 @@ class ModelMetaStub(Protocol):
app_label: str
model_name: str

def get_fields(self) -> list:
...
def get_fields(self) -> list: ...


class BaseUuidModelStub(AuditModelStub, Protocol):
id: UUID
admin_url_name: str
admin_site_name: str

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

objects: models.Manager
_meta: ModelMetaStub
Expand All @@ -39,8 +37,7 @@ class BaseUuidHistoryModelStub(AuditModelStub, Protocol):
admin_url_name: str
admin_site_name: str

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

objects: models.Manager
history: models.Manager
Expand Down
1 change: 0 additions & 1 deletion edc_model/widgets/slider_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@


class SliderWidget(Input):

"""
class HtnMedicationAdherenceForm(CrfModelFormMixin, forms.ModelForm):
form_validator_cls = HtnMedicationAdherenceFormValidator
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exclude =
edc_ltfu.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 4adedef

Please sign in to comment.