meta-edc 1.1.8__py3-none-any.whl → 1.1.12__py3-none-any.whl

meta_consent/baker_recipes.py

@@ -1,7 +1,7 @@
 from dateutil.relativedelta import relativedelta
 from django.contrib.sites.models import Site
-from edc_constants.constants import NO, YES
-from edc_utils import get_utcnow
+from django.utils import timezone
+from edc_constants.constants import NO, NULL_STRING, YES
 from faker import Faker
 from model_bakery.recipe import Recipe, seq
 
@@ -13,10 +13,10 @@ opts = dict(
     assessment_score=YES,
     confirm_identity=seq("12315678"),
     consent_copy=YES,
-    consent_datetime=get_utcnow(),
+    consent_datetime=timezone.now(),
     consent_reviewed=YES,
     consent_signature=YES,
-    dob=get_utcnow() - relativedelta(years=25),
+    dob=timezone.now() - relativedelta(years=25),
     first_name=fake.first_name,
     gender="M",
     identity=seq("12315678"),
@@ -26,16 +26,15 @@ opts = dict(
     is_incarcerated=NO,
     is_literate=YES,
     last_name=fake.last_name,
-    screening_identifier=None,
+    screening_identifier=NULL_STRING,
     study_questions=YES,
     site=Site.objects.get_current(),
-    subject_identifier=None,
+    subject_identifier=NULL_STRING,
     user_created="erikvw",
     user_modified="erikvw",
 )
 subjectconsent = Recipe(SubjectConsent, **opts)
 subjectconsentv1 = Recipe(SubjectConsentV1, **opts)
-# subjectconsentv1ext = Recipe(SubjectConsentV1Ext, **opts)
 
 subjectreconsent = Recipe(
     SubjectReconsent,
@@ -44,7 +43,7 @@ subjectreconsent = Recipe(
     assessment_score=YES,
     study_questions=YES,
     consent_copy=YES,
-    action_identifier=None,
+    action_identifier=NULL_STRING,
     user_created="erikvw",
     user_modified="erikvw",
 )

meta_consent/form_validators/__init__.py

@@ -1 +1,3 @@
 from .subject_consent_form_validator import SubjectConsentFormValidator
+
+__all__ = ["SubjectConsentFormValidator"]

meta_consent/forms/__init__.py

@@ -2,3 +2,10 @@ from .subject_consent_form import SubjectConsentForm
 from .subject_consent_v1_ext_form import SubjectConsentV1ExtForm
 from .subject_consent_v1_form import SubjectConsentV1Form
 from .subject_reconsent_form import SubjectReconsentForm
+
+__all__ = [
+    "SubjectConsentForm",
+    "SubjectConsentV1ExtForm",
+    "SubjectConsentV1Form",
+    "SubjectReconsentForm",
+]

meta_consent/forms/subject_consent_v1_ext_form.py

@@ -12,7 +12,6 @@ from ..models import SubjectConsentV1Ext
 class SubjectConsentV1ExtForm(
     SiteModelFormMixin, ReviewFieldsModelFormMixin, FormValidatorMixin, forms.ModelForm
 ):
-
     def clean(self):
         cleaned_data = super().clean()
         start_datetime = to_local(consent_v1_ext.start)
@@ -29,14 +28,14 @@ class SubjectConsentV1ExtForm(
             raise forms.ValidationError({"agrees_to_extension": "Invalid option"})
         return cleaned_data
 
-    widgets = {
+    widgets = {  # noqa: RUF012
         "subject_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
     }
 
     class Meta:
         model = SubjectConsentV1Ext
         fields = "__all__"
-        labels = {
+        labels = {  # noqa: RUF012
             "study_questions": (
                 "I have answered all questions the participant had about the "
                 "follow-up extension"

meta_consent/forms/subject_reconsent_form.py

@@ -23,15 +23,15 @@ class SubjectReconsentForm(
                 subject_identifier=cleaned_data.get("subject_identifier"),
                 identity=cleaned_data.get("identity"),
             )
-        except ObjectDoesNotExist:
-            raise forms.ValidationError({"identity": "Identity number does not match."})
+        except ObjectDoesNotExist as e:
+            raise forms.ValidationError({"identity": "Identity number does not match."}) from e
         return cleaned_data
 
     class Meta:
         model = SubjectReconsent
         fields = "__all__"
-        help_text = {"action_identifier": "(read-only)", "subject_identifier": "(read-only)"}
-        widgets = {
+        help_text = {"action_identifier": "(read-only)", "subject_identifier": "(read-only)"}  # noqa: RUF012
+        widgets = {  # noqa: RUF012
             "action_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
             "subject_identifier": forms.TextInput(attrs={"readonly": "readonly"}),
         }

meta_consent/management/commands/create_missing_prescriptions.py

@@ -1,3 +1,5 @@
+import sys
+
 from django.core.management.base import BaseCommand, CommandError
 from edc_pharmacy.exceptions import PrescriptionAlreadyExists
 from edc_pharmacy.models import Medication, Rx
@@ -12,7 +14,7 @@ from meta_pharmacy.constants import METFORMIN
 class Command(BaseCommand):
     help = "Create missing prescriptions"
 
-    def handle(self, *args, **options):
+    def handle(self, *args, **options):  # noqa: ARG002
         medication = Medication.objects.get(name=METFORMIN)
         subject_identifiers = Rx.objects.values_list("subject_identifier", flat=True).all()
         subject_consents_wo_rx = SubjectConsent.objects.exclude(
@@ -31,4 +33,4 @@ class Command(BaseCommand):
             except PrescriptionAlreadyExists:
                 pass
             except CommandError as e:
-                print(f"Failed for {instance.subject_identifier}. Got {e}")
+                sys.stdout.write(f"Failed for {instance.subject_identifier}. Got {e}\n")

meta_consent/migrations/0001_initial.py

@@ -8,7 +8,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_crypto_fields.fields.encrypted_char_field
 import django_crypto_fields.fields.encrypted_text_field
 import django_crypto_fields.fields.firstname_field
@@ -55,14 +55,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -288,14 +288,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -773,14 +773,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -1043,14 +1043,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

meta_consent/migrations/0024_historicalsubjectconsentv1.py

@@ -8,7 +8,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_crypto_fields.fields.encrypted_char_field
 import django_crypto_fields.fields.encrypted_text_field
 import django_crypto_fields.fields.firstname_field
@@ -24,7 +24,6 @@ import uuid
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("sites", "0002_alter_domain_unique"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
@@ -48,15 +47,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",

meta_consent/migrations/0026_historicalsubjectconsentv1ext_subjectconsentv1ext.py

@@ -5,7 +5,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_crypto_fields.fields.encrypted_text_field
 import django_revision.revision_field
 import edc_action_item.managers
@@ -18,7 +18,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_action_item", "0037_remove_actionitem_reference_model_and_more"),
         ("meta_consent", "0025_alter_historicalsubjectconsent_first_name_and_more"),
@@ -43,15 +42,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",
@@ -309,15 +304,11 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "modified",
-                    models.DateTimeField(
-                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
-                    ),
+                    models.DateTimeField(blank=True, default=django.utils.timezone.now),
                 ),
                 (
                     "user_created",