diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ec2681..59f4d55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 }} @@ -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: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6f3af91..a32918b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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.2.0 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$ @@ -42,7 +42,7 @@ repos: - id: detect-private-key - repo: https://github.com/adrienverge/yamllint - rev: v1.32.0 + rev: v1.34.0 hooks: - id: yamllint args: diff --git a/dx_app/consents.py b/dx_app/consents.py index 270fbc3..6f8de14 100644 --- a/dx_app/consents.py +++ b/dx_app/consents.py @@ -4,7 +4,7 @@ from edc_protocol.research_protocol_config import ResearchProtocolConfig consent_v1 = ConsentDefinition( - "dx_app.subjectconsent", + "dx_app.subjectconsentv1", version="1", start=ResearchProtocolConfig().study_open_datetime, end=ResearchProtocolConfig().study_close_datetime, diff --git a/dx_app/models.py b/dx_app/models.py index 8a30a35..5fa2534 100644 --- a/dx_app/models.py +++ b/dx_app/models.py @@ -56,6 +56,11 @@ class SubjectConsent( dob = models.DateField(default=date(1995, 1, 1)) +class SubjectConsentV1(SubjectConsent): + class Meta: + proxy = True + + class ClinicalReviewBaseline( baseline_review_model_mixin_factory(), ClinicalReviewBaselineModelMixin,