edc-vitals 0.1.11__tar.gz → 0.1.13__tar.gz

{edc-vitals-0.1.11 → edc-vitals-0.1.13}/.github/workflows/build.yml

@@ -11,11 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11']
-        django-version: ['4.1', '4.2', 'dev']
-        exclude:
-          - python-version: '3.10'
-            django-version: 'dev'
+        python-version: ['3.11']
+        django-version: ['4.2', 'dev']
     services:
       mysql:
         image: mysql:latest

{edc-vitals-0.1.11 → edc-vitals-0.1.13}/.pre-commit-config.yaml

@@ -10,13 +10,13 @@ repos:
           - "-x *test*.py"
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.9.1
     hooks:
       - id: black
-        language_version: python3.10
+        language_version: python3.11
 
   - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         args:
@@ -42,7 +42,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.31.0
+    rev: v1.32.0
     hooks:
       - id: yamllint
         args:

{edc-vitals-0.1.11 → edc-vitals-0.1.13}/MANIFEST.in

@@ -1,3 +1,4 @@
 include AUTHORS CHANGES LICENSE VERSION
 include MANIFEST.in
 include *.rst
+include */locale/*/LC_MESSAGES/*.mo

{edc-vitals-0.1.11 → edc-vitals-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edc-vitals
-Version: 0.1.11
+Version: 0.1.13
 Summary: Classes for BP, weight, etc for clinicedc/edc projects
 Home-page: https://github.com/clinicedc/edc-vitals
 Author: Erik van Widenfelt
@@ -9,14 +9,13 @@ License: GPL license, see LICENSE
 Keywords: django edc vitals,clinicedc,clinical trials
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.1
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS

{edc-vitals-0.1.11 → edc-vitals-0.1.13}/edc_vitals.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edc-vitals
-Version: 0.1.11
+Version: 0.1.13
 Summary: Classes for BP, weight, etc for clinicedc/edc projects
 Home-page: https://github.com/clinicedc/edc-vitals
 Author: Erik van Widenfelt
@@ -9,14 +9,13 @@ License: GPL license, see LICENSE
 Keywords: django edc vitals,clinicedc,clinical trials
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.1
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS

{edc-vitals-0.1.11 → edc-vitals-0.1.13}/pyproject.toml

@@ -1,18 +1,17 @@
 [build-system]
-requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
-build-backend = "setuptools.build_meta"
+requires = ["setuptools>=60", "setuptools-scm>=8.0"]
 
 [tool.setuptools_scm]
-write_to = "_version.py"
+version_file="_version.py"
 
 [tool.black]
 line-length = 95
-target-version = ["py310"]
+target-version = ["py311"]
 extend-exclude = '''^(.*\/)*\b(migrations)\b($|\/.*$)'''
 
 [tool.isort]
 profile = "black"
-py_version = "310"
+py_version = "311"
 skip = [".tox", ".eggs", "migrations"]
 
 [tool.coverage.run]
@@ -36,20 +35,17 @@ exclude_lines = [
 legacy_tox_ini = """
 [tox]
 envlist =
-    py{310}-dj{41,42},
-    py{311}-dj{41,42,dev},
+    py{311}-dj{42,dev},
     lint
 
 isolated_build = true
 
 [gh-actions]
 python =
-    3.10: py310
     3.11: py311, lint
 
 [gh-actions:env]
 DJANGO =
-    4.1: dj41
     4.2: dj42, lint
     dev: djdev
 
@@ -59,7 +55,6 @@ 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
-    dj41: Django>=4.1,<4.2
     dj42: Django>=4.2,<5.0
     djdev: https://github.com/django/django/tarball/main
 

edc-vitals-0.1.13/runtests.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+import logging
+from pathlib import Path
+
+from edc_test_utils import DefaultTestSettings, func_main
+
+app_name = "edc_vitals"
+base_dir = Path(__file__).absolute().parent
+
+project_settings = DefaultTestSettings(
+    calling_file=__file__,
+    BASE_DIR=base_dir,
+    APP_NAME=app_name,
+    ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
+    SILENCED_SYSTEM_CHECKS=[
+        "sites.E101",
+        "edc_navbar.E002",
+        "edc_navbar.E003",
+        "edc_consent.E001",
+        "edc_sites.E001",
+        "edc_sites.E002",
+    ],
+    SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
+    INSTALLED_APPS=[
+        "django.contrib.admin",
+        "django.contrib.auth",
+        "django.contrib.contenttypes",
+        "django.contrib.sessions",
+        "django.contrib.messages",
+        "django.contrib.staticfiles",
+        "django.contrib.sites",
+        "django_crypto_fields.apps.AppConfig",
+        # "django_revision.apps.AppConfig",
+        "multisite",
+        "edc_action_item.apps.AppConfig",
+        "edc_appointment.apps.AppConfig",
+        "edc_auth.apps.AppConfig",
+        "edc_data_manager.apps.AppConfig",
+        "edc_device.apps.AppConfig",
+        "edc_facility.apps.AppConfig",
+        "edc_form_runners.apps.AppConfig",
+        "edc_identifier.apps.AppConfig",
+        "edc_lab.apps.AppConfig",
+        "edc_label.apps.AppConfig",
+        "edc_locator.apps.AppConfig",
+        "edc_metadata.apps.AppConfig",
+        "edc_notification.apps.AppConfig",
+        "edc_offstudy.apps.AppConfig",
+        "edc_registration.apps.AppConfig",
+        "edc_sites.apps.AppConfig",
+        "edc_timepoint.apps.AppConfig",
+        "edc_visit_schedule.apps.AppConfig",
+        "edc_visit_tracking.apps.AppConfig",
+        "edc_vitals.apps.AppConfig",
+        "edc_appconfig.apps.AppConfig",
+    ],
+    use_test_urls=True,
+    add_dashboard_middleware=True,
+).settings
+
+
+def main():
+    func_main(project_settings, f"{app_name}.tests")
+
+
+if __name__ == "__main__":
+    logging.basicConfig()
+    main()

{edc-vitals-0.1.11 → edc-vitals-0.1.13}/setup.cfg

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

edc-vitals-0.1.11/runtests.py

@@ -1,47 +0,0 @@
-#!/usr/bin/env python
-import logging
-import os
-import sys
-from os.path import abspath, dirname
-
-import django
-from django.conf import settings
-from django.test.runner import DiscoverRunner
-from edc_test_utils import DefaultTestSettings
-
-app_name = "edc_vitals"
-base_dir = dirname(abspath(__file__))
-
-DEFAULT_SETTINGS = DefaultTestSettings(
-    calling_file=__file__,
-    template_dirs=[os.path.join(base_dir, app_name, "tests", "templates")],
-    BASE_DIR=base_dir,
-    APP_NAME=app_name,
-    ETC_DIR=os.path.join(base_dir, app_name, "tests", "etc"),
-    INSTALLED_APPS=[
-        "django.contrib.admin",
-        "django.contrib.auth",
-        "django.contrib.contenttypes",
-        "django.contrib.sessions",
-        "django.contrib.messages",
-        "django.contrib.staticfiles",
-        "django.contrib.sites",
-        "edc_vitals.apps.AppConfig",
-    ],
-    use_test_urls=True,
-    add_dashboard_middleware=True,
-).settings
-
-
-def main():
-    if not settings.configured:
-        settings.configure(**DEFAULT_SETTINGS)
-    django.setup()
-    tags = [t.split("=")[1] for t in sys.argv if t.startswith("--tag")]
-    failures = DiscoverRunner(failfast=False, tags=tags).run_tests([f"{app_name}.tests"])
-    sys.exit(failures)
-
-
-if __name__ == "__main__":
-    logging.basicConfig()
-    main()