Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:clinicedc/edc-model-fields into …
Browse files Browse the repository at this point in the history
…develop
  • Loading branch information
erikvw committed Feb 9, 2024
2 parents 9876930 + 1b3a484 commit 77f2e6e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ jobs:
sudo apt-get -y update
sudo apt-get install libcups2-dev wamerican
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -48,7 +48,7 @@ jobs:
echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.pip-cache.outputs.dir }}
key:
Expand Down
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
2 changes: 0 additions & 2 deletions edc_model_fields/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_fields/fields/identity_type_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


class IdentityTypeField(CharField):

"""Identity type field class.
Pair with the `Identity` field.
Expand Down
1 change: 0 additions & 1 deletion edc_model_fields/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

0 comments on commit 77f2e6e

Please sign in to comment.