Merge branch 'release/0.1.37' into main

.pre-commit-config.yaml

@@ -3,32 +3,32 @@ exclude: tests/etc/user-*
 
 repos:
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.4
+    rev: 1.7.5
     hooks:
       - id: bandit
         args:
           - "-x *test*.py"
 
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 23.1.0
     hooks:
       - id: black
         language_version: python3.9
 
   - repo: https://github.com/pycqa/flake8
-    rev: 4.0.1
+    rev: 6.0.0
     hooks:
       - id: flake8
         args:
           - "--config=setup.cfg"
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.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.26.3
+    rev: v1.30.0
     hooks:
       - id: yamllint
         args:

edc_pharmacy/tests/tests/test_packaging.py

@@ -1,5 +1,5 @@
 from dateutil.relativedelta import relativedelta
-from django.test import TestCase, tag
+from django.test import TestCase
 from edc_facility import import_holidays
 from edc_list_data import site_list_data
 from edc_randomization.constants import ACTIVE, PLACEBO
@@ -29,7 +29,6 @@
 
 
 class TestPackaging(TestCaseMixin, TestCase):
-
     import_randomization_list = True
     site_names = [x.name for x in all_sites]
     sid_count_for_tests = 5
@@ -71,7 +70,6 @@ def setUp(self):
             assignment=PLACEBO,
         )
 
-    @tag("11")
     def test_repack(self):
         container_type = ContainerType.objects.create(name="bottle")
 
@@ -113,7 +111,6 @@ def test_repack(self):
         for obj in PillBottle.objects.filter(source_container=source_pill_bottle):
             self.assertEquals(obj.unit_qty, 128)
 
-    @tag("11")
     def test_repack_for_subject(self):
         container_type = ContainerType.objects.create(name="bottle")
         location = Location.objects.create(name="LOCATION_ONE")

edc_pharmacy/tests/tests/test_prescription.py

@@ -1,6 +1,6 @@
 from dateutil.relativedelta import relativedelta
 from django.core.exceptions import ObjectDoesNotExist
-from django.test import TestCase, tag
+from django.test import TestCase
 from edc_constants.constants import FEMALE
 from edc_list_data import site_list_data
 from edc_randomization.site_randomizers import site_randomizers
@@ -21,7 +21,6 @@
 from edc_pharmacy.prescribe import create_prescription
 
 
-@tag("rx")
 class TestPrescription(TestCase):
     def setUp(self):
         site_list_data.initialize()

pyproject.toml

@@ -26,27 +26,29 @@ source = ["edc_pharmacy"]
 [tool.coverage.report]
 show_missing = true
 skip_covered = true
+omit = ["requirements.txt"]
+exclude_lines = [
+  "pragma: no cover",
+  "if TYPE_CHECKING:",
+]
 
 [tool.tox]
 legacy_tox_ini = """
 [tox]
 envlist =
-    py{38,39,310}-dj{32,40,41,dev},
+    py{310,311}-dj{41,dev},
     lint
 
 isolated_build = true
 
 [gh-actions]
 python =
-    3.8: py38
-    3.9: py39, lint
     3.10: py310
+    3.11: py311, lint
 
 [gh-actions:env]
 DJANGO =
-    3.2: dj32, lint
-    4.0: dj40
-    4.1: dj41
+    4.1: dj41, lint
     dev: djdev
 
 [testenv]
@@ -55,13 +57,11 @@ deps =
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/test_utils.txt
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/third_party_dev.txt
-    dj32: Django>=3.2,<3.3
-    dj40: Django>=4.0,<4.1
     dj41: Django>=4.1,<4.2
     djdev: https://github.com/django/django/tarball/main
 
 commands =
-    pip install -U pip
+    pip install -U pip coverage[toml]
     pip --version
     pip freeze
     coverage run -a runtests.py

setup.cfg

@@ -12,20 +12,18 @@ keywords = django Edc pharmacy, clinicedc, clinical trials
 classifiers=
     Environment :: Web Environment
     Framework :: Django
-    Framework :: Django :: 3.2
     Framework :: Django :: 4.0
     Framework :: Django :: 4.1
     Intended Audience :: Developers
     Intended Audience :: Science/Research
     Operating System :: OS Independent
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 
 
 [options]
-python_requires = >=3.8
+python_requires = >=3.10
 zip_safe = False
 include_package_data = True
 packages = find: