Merge branch 'release/0.1.38' into main

clinicedc · May 24, 2023 · ea37a99 · ea37a99
2 parents 7c8104c + 5a4893e
commit ea37a99
Show file tree

Hide file tree

Showing 66 changed files with 19 additions and 92 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,9 +11,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10']
-        django-version: ['3.2', '4.0', '4.1', 'dev']
-
+        python-version: ['3.10', '3.11']
+        django-version: ['4.1', '4.2', 'dev']
+        exclude:
+          - python-version: '3.10'
+            django-version: 'dev'
     services:
       mysql:
         image: mysql:latest
@@ -31,20 +33,19 @@ jobs:
           sudo apt-get -y update
           sudo apt-get install libcups2-dev wamerican
 
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Get pip cache dir
         id: pip-cache
         run: |
-          echo "::set-output name=dir::$(pip cache dir)"
+          echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key:
@@ -64,7 +65,7 @@ jobs:
         env:
           DJANGO: ${{ matrix.django-version }}
 
-      - name: Upload coverage
-        uses: codecov/codecov-action@v1
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
         with:
           name: Python ${{ matrix.python-version }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,10 +10,10 @@ repos:
           - "-x *test*.py"
 
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
-        language_version: python3.9
+        language_version: python3.10
 
   - repo: https://github.com/pycqa/flake8
     rev: 6.0.0
@@ -42,7 +42,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.30.0
+    rev: v1.31.0
     hooks:
       - id: yamllint
         args:

diff --git a/VERSION b/VERSION
diff --git a/edc_pharmacy/admin/dispensing_history_admin.py b/edc_pharmacy/admin/dispensing_history_admin.py
@@ -13,7 +13,6 @@
 
 @admin.register(DispensingHistory, site=edc_pharmacy_admin)
 class DispensingHistoryAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     form = DispensingHistoryForm
 
     fieldsets = (

diff --git a/edc_pharmacy/admin/dosage_guideline_admin.py b/edc_pharmacy/admin/dosage_guideline_admin.py
@@ -11,7 +11,6 @@
 
 @admin.register(DosageGuideline, site=edc_pharmacy_admin)
 class DosageGuidelineAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     autocomplete_fields = ["medication"]

diff --git a/edc_pharmacy/admin/formulation_admin.py b/edc_pharmacy/admin/formulation_admin.py
@@ -11,7 +11,6 @@
 
 @admin.register(Formulation, site=edc_pharmacy_admin)
 class FormulationAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     autocomplete_fields = ["medication"]

diff --git a/edc_pharmacy/admin/labels_admin.py b/edc_pharmacy/admin/labels_admin.py
@@ -10,7 +10,6 @@
 
 @admin.register(Labels, site=edc_pharmacy_admin)
 class LabelsAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     form = LabelsForm

diff --git a/edc_pharmacy/admin/list_filters.py b/edc_pharmacy/admin/list_filters.py
@@ -5,7 +5,6 @@
 
 
 class MedicationsListFilter(SimpleListFilter):
-
     title = "Medication"
     parameter_name = "medication_name"
 

diff --git a/edc_pharmacy/admin/medication_admin.py b/edc_pharmacy/admin/medication_admin.py
@@ -11,7 +11,6 @@
 
 @admin.register(Medication, site=edc_pharmacy_admin)
 class MedicationAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     form = MedicationForm

diff --git a/edc_pharmacy/admin/medication_lot_admin.py b/edc_pharmacy/admin/medication_lot_admin.py
@@ -11,7 +11,6 @@
 
 @admin.register(MedicationLot, site=edc_pharmacy_admin)
 class MedicationLotAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     form = MedicationLotForm

diff --git a/edc_pharmacy/admin/order_admin.py b/edc_pharmacy/admin/order_admin.py
@@ -8,7 +8,6 @@
 
 @admin.register(Order, site=edc_pharmacy_admin)
 class OrderAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     # autocomplete_fields = (

diff --git a/edc_pharmacy/admin/product_admin.py b/edc_pharmacy/admin/product_admin.py
@@ -9,7 +9,6 @@
 
 @admin.register(Product, site=edc_pharmacy_admin)
 class ProductAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     form = ProductForm

diff --git a/edc_pharmacy/admin/return_history_admin.py b/edc_pharmacy/admin/return_history_admin.py
@@ -13,7 +13,6 @@
 
 @admin.register(ReturnHistory, site=edc_pharmacy_admin)
 class ReturnHistoryAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     form = ReturnHistoryForm
 
     fieldsets = (

diff --git a/edc_pharmacy/admin/rx_admin.py b/edc_pharmacy/admin/rx_admin.py
@@ -12,7 +12,6 @@
 
 @admin.register(Rx, site=edc_pharmacy_admin)
 class RxAdmin(ModelAdminSubjectDashboardMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     form = RxForm

diff --git a/edc_pharmacy/admin/rx_refill_admin.py b/edc_pharmacy/admin/rx_refill_admin.py
@@ -19,7 +19,6 @@
 
 @admin.register(RxRefill, site=edc_pharmacy_admin)
 class RxRefillAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     ordering: Tuple[str, ...] = ("refill_start_datetime",)
@@ -210,7 +209,6 @@ def get_subject_dashboard_url_kwargs(self, obj):
 
 
 class RxRefillInlineAdmin(admin.StackedInline):
-
     form = RxRefillForm
 
     model = RxRefill

diff --git a/edc_pharmacy/admin/stock_admin.py b/edc_pharmacy/admin/stock_admin.py
@@ -9,7 +9,6 @@
 
 @admin.register(Stock, site=edc_pharmacy_admin)
 class StockAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     form = StockForm

diff --git a/edc_pharmacy/admin/stock_create_labels_admin.py b/edc_pharmacy/admin/stock_create_labels_admin.py
@@ -10,7 +10,6 @@
 
 @admin.register(StockCreateLabels, site=edc_pharmacy_admin)
 class StockCreateLabelsAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     form = StockCreateLabelsForm

diff --git a/edc_pharmacy/admin/stock_receiving_admin.py b/edc_pharmacy/admin/stock_receiving_admin.py
@@ -9,7 +9,6 @@
 
 @admin.register(StockReceiving, site=edc_pharmacy_admin)
 class StockReceivingAdmin(ModelAdminMixin, admin.ModelAdmin):
-
     show_object_tools = True
 
     form = StockReceivingForm

diff --git a/edc_pharmacy/approve_prescription.py b/edc_pharmacy/approve_prescription.py
@@ -3,7 +3,6 @@ class PrescriptionApprovalValidatorError(Exception):
 
 
 class ApprovePrescription:
-
     prescription_model = "edc_pharmacy.rx"
 
     def __init__(self, rx_model_obj=None):

diff --git a/edc_pharmacy/dosage_calculator.py b/edc_pharmacy/dosage_calculator.py
@@ -13,7 +13,6 @@ def __init__(
         formulation: Optional[Any] = None,
         weight_in_kgs: Optional[Union[float, Decimal]] = None,
     ) -> None:
-
         self.dosage_guideline = dosage_guideline
         self.formulation = formulation
         if formulation.medication != dosage_guideline.medication:

diff --git a/edc_pharmacy/forms/crf/study_medication_modelform_mixin.py b/edc_pharmacy/forms/crf/study_medication_modelform_mixin.py
@@ -4,7 +4,6 @@
 
 
 class StudyMedicationModelFormMixin:
-
     form_validator_cls = StudyMedicationFormValidator
 
     def clean(self):

diff --git a/edc_pharmacy/forms/dispensing_history_form.py b/edc_pharmacy/forms/dispensing_history_form.py
@@ -21,7 +21,6 @@ class Meta:
 
 
 class DispensingHistoryReadonlyForm(forms.ModelForm):
-
     count = forms.DecimalField(
         label="Count", widget=forms.TextInput(attrs={"readonly": "readonly"})
     )

diff --git a/edc_pharmacy/migrations/0001_initial.py b/edc_pharmacy/migrations/0001_initial.py
@@ -31,7 +31,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

diff --git a/edc_pharmacy/migrations/0002_alter_medication_unique_together.py b/edc_pharmacy/migrations/0002_alter_medication_unique_together.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0001_initial"),
     ]

diff --git a/edc_pharmacy/migrations/0003_alter_rxrefill_unique_together.py b/edc_pharmacy/migrations/0003_alter_rxrefill_unique_together.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0002_alter_medication_unique_together"),
     ]

diff --git a/edc_pharmacy/migrations/0004_auto_20220414_1741.py b/edc_pharmacy/migrations/0004_auto_20220414_1741.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0003_alter_rxrefill_unique_together"),
     ]

diff --git a/edc_pharmacy/migrations/0005_alter_rx_managers.py b/edc_pharmacy/migrations/0005_alter_rx_managers.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0004_auto_20220414_1741"),
     ]

diff --git a/edc_pharmacy/migrations/0006_historicalrxrefill_roundup_divisible_by_and_more.py b/edc_pharmacy/migrations/0006_historicalrxrefill_roundup_divisible_by_and_more.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0005_alter_rx_managers"),
     ]

diff --git a/edc_pharmacy/migrations/0007_auto_20220704_1841.py b/edc_pharmacy/migrations/0007_auto_20220704_1841.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0006_historicalrxrefill_roundup_divisible_by_and_more"),
     ]

diff --git a/edc_pharmacy/migrations/0008_auto_20220706_2324.py b/edc_pharmacy/migrations/0008_auto_20220706_2324.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0007_auto_20220704_1841"),
     ]

diff --git a/edc_pharmacy/migrations/0009_auto_20220708_0805.py b/edc_pharmacy/migrations/0009_auto_20220708_0805.py
@@ -19,7 +19,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("sites", "0002_alter_domain_unique"),

diff --git a/edc_pharmacy/migrations/0010_auto_20220708_0813.py b/edc_pharmacy/migrations/0010_auto_20220708_0813.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0009_auto_20220708_0805"),
     ]

diff --git a/edc_pharmacy/migrations/0011_auto_20220826_0406.py b/edc_pharmacy/migrations/0011_auto_20220826_0406.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0010_auto_20220708_0813"),
     ]

diff --git a/edc_pharmacy/migrations/0012_auto_20220907_0157.py b/edc_pharmacy/migrations/0012_auto_20220907_0157.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0011_auto_20220826_0406"),
     ]

diff --git a/edc_pharmacy/migrations/0013_auto_20220907_0202.py b/edc_pharmacy/migrations/0013_auto_20220907_0202.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0012_auto_20220907_0157"),
     ]

diff --git a/edc_pharmacy/migrations/0014_auto_20220907_0207.py b/edc_pharmacy/migrations/0014_auto_20220907_0207.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0013_auto_20220907_0202"),
     ]

diff --git a/edc_pharmacy/migrations/0015_auto_20220913_2139.py b/edc_pharmacy/migrations/0015_auto_20220913_2139.py
@@ -17,7 +17,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("edc_pharmacy", "0014_auto_20220907_0207"),

diff --git a/edc_pharmacy/migrations/0016_auto_20220929_1742.py b/edc_pharmacy/migrations/0016_auto_20220929_1742.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("edc_pharmacy", "0015_auto_20220913_2139"),
     ]

diff --git a/edc_pharmacy/model_mixins/medication_order_model_mixin.py b/edc_pharmacy/model_mixins/medication_order_model_mixin.py
@@ -3,7 +3,6 @@
 
 
 class MedicationOrderModelMixin(models.Model):
-
     stock = models.ForeignKey(
         "edc_pharmacy.stock",
         null=True,

diff --git a/edc_pharmacy/model_mixins/study_medication_crf_model_mixin.py b/edc_pharmacy/model_mixins/study_medication_crf_model_mixin.py
@@ -22,7 +22,6 @@ class StudyMedicationCrfModelMixin(PreviousNextModelMixin, StudyMedicationRefill
     """Declare with field subject_visit using a CRF model mixin"""
 
     def save(self, *args, **kwargs):
-
         if not self.formulation:
             raise StudyMedicationError(
                 f"Formulation cannot be None. Perhaps catch this in the form. See {self}."

diff --git a/edc_pharmacy/model_mixins/study_medication_refill_model_mixin.py b/edc_pharmacy/model_mixins/study_medication_refill_model_mixin.py
@@ -7,7 +7,6 @@
 
 
 class StudyMedicationRefillModelMixin(models.Model):
-
     refill = models.CharField(
         verbose_name="Will the subject receive study medication for this visit",
         max_length=15,

diff --git a/edc_pharmacy/models/dispensing_history.py b/edc_pharmacy/models/dispensing_history.py
@@ -10,7 +10,6 @@
 
 
 class Manager(models.Manager):
-
     use_in_migrations = True
 
     def get_by_natural_key(self, rx_refill, dispensed_datetime):