Merge pull request #99 from GeriLife/upgrade-pre-commit

Update pre-commit hooks and improve code readability

Author: brylie

.gitignore

@@ -80,9 +80,6 @@ target/
 profile_default/
 ipython_config.py
 
-# pyenv
-.python-version
-
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
 #   However, in case of collaboration, if having platform-specific dependencies or dependencies

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
@@ -11,12 +11,12 @@ repos:
       - id: check-toml
       - id: check-merge-conflict
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
-        args: [--py311-plus]
+        args: [--py312-plus]
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.15.0
+    rev: 1.23.1
     hooks:
       - id: django-upgrade
         args: [--target-version, "4.2"]
@@ -28,7 +28,7 @@ repos:
         exclude: ".*migrations/.*"
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.1.5
+    rev: v0.11.0
     hooks:
       # Run the linter.
       - id: ruff
@@ -46,11 +46,11 @@ repos:
     hooks:
       - id: docformatter
   - repo: https://github.com/rtts/djhtml
-    rev: 3.0.6
+    rev: 3.0.7
     hooks:
       - id: djhtml
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.1.0
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
         types_or:
@@ -61,7 +61,7 @@ repos:
           - scss
           - yaml
   - repo: https://github.com/google/keep-sorted
-    rev: v0.2.0
+    rev: v0.6.0
     hooks:
       - id: keep-sorted
         exclude: ".*migrations/.*"

.python-version

@@ -0,0 +1 @@
+3.12

README.md

@@ -40,7 +40,7 @@ In essence, GeriLife is more than just a software tool; it's a commitment to enh
 
 GeriLife is created by co-founders Brylie Christopher Oxley and Marjo-Riitta Rikala. The following paragraphs describe a bit about the history of how we created GeriLife and the purposes it serves.
 
-**A Volunteer's Insight**: Our journey with GeriLife began not in front of screens or keyboards but within the bustling environment of an institutional elder care facility. As a volunteer, Brylie engaged with residents, bringing them joy through simple activities like walks, music sessions, or group events. However, choosing which residents to invite often fell to the on-duty nurses, who, despite their best intentions, tended to select the more social or visible residents. This unintentional bias left a silent but significant portion of the community overlooked. It was here, amid the day-to-day activities, where a nurse sowed the seed of our project. 
+**A Volunteer's Insight**: Our journey with GeriLife began not in front of screens or keyboards but within the bustling environment of an institutional elder care facility. As a volunteer, Brylie engaged with residents, bringing them joy through simple activities like walks, music sessions, or group events. However, choosing which residents to invite often fell to the on-duty nurses, who, despite their best intentions, tended to select the more social or visible residents. This unintentional bias left a silent but significant portion of the community overlooked. It was here, amid the day-to-day activities, where a nurse sowed the seed of our project.
 
 **From Observation to Action**: In search of a solution, a nurse suggested Brylie use a small paper notebook to record the activities he facilitated —- names of the residents, the nature of the activity, dates, and other observations. This humble beginning, documenting activities in a notebook, gradually revealed a powerful narrative: the need for a coordinated approach to ensure every resident had equal opportunities for engagement and enrichment.
 

core/urls.py

@@ -13,6 +13,7 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+
 from django.contrib import admin
 from django.urls import include, path
 from django.views.generic.base import TemplateView

homes/charts.py

@@ -246,16 +246,16 @@ def prepare_work_by_caregiver_role_and_type_charts(context: dict) -> dict:
         get_total_hours_by_role_and_work_type_with_percent(home.id)
     )
 
-    context[
-        "work_percent_by_caregiver_role_and_type_chart"
-    ] = prepare_work_percent_by_caregiver_role_and_type_chart(
-        work_by_caregiver_role_and_type_with_percent,
+    context["work_percent_by_caregiver_role_and_type_chart"] = (
+        prepare_work_percent_by_caregiver_role_and_type_chart(
+            work_by_caregiver_role_and_type_with_percent,
+        )
     )
 
-    context[
-        "work_by_caregiver_role_and_type_chart"
-    ] = prepare_work_by_caregiver_role_and_type_chart(
-        work_by_caregiver_role_and_type_with_percent,
+    context["work_by_caregiver_role_and_type_chart"] = (
+        prepare_work_by_caregiver_role_and_type_chart(
+            work_by_caregiver_role_and_type_with_percent,
+        )
     )
 
     return context

homes/views.py

@@ -117,17 +117,17 @@ def prepare_activity_charts(self, context):
         """Prepare activity charts and add them to the template context."""
         home = context["home"]
 
-        context[
-            "activity_counts_by_resident_and_activity_type_chart"
-        ] = prepare_activity_counts_by_resident_and_activity_type_chart(home)
+        context["activity_counts_by_resident_and_activity_type_chart"] = (
+            prepare_activity_counts_by_resident_and_activity_type_chart(home)
+        )
 
-        context[
-            "monthly_activity_hours_by_type_chart"
-        ] = prepare_monthly_activity_hours_by_type_chart(home)
+        context["monthly_activity_hours_by_type_chart"] = (
+            prepare_monthly_activity_hours_by_type_chart(home)
+        )
 
-        context[
-            "monthly_activity_hours_by_caregiver_role_chart"
-        ] = prepare_monthly_activity_hours_by_caregiver_role_chart(home)
+        context["monthly_activity_hours_by_caregiver_role_chart"] = (
+            prepare_monthly_activity_hours_by_caregiver_role_chart(home)
+        )
 
         return context
 
@@ -141,9 +141,9 @@ def prepare_work_charts(self, context):
             home,
         )
 
-        context[
-            "daily_work_percent_by_caregiver_role_and_type_chart"
-        ] = prepare_daily_work_percent_by_caregiver_role_and_type_chart(home)
+        context["daily_work_percent_by_caregiver_role_and_type_chart"] = (
+            prepare_daily_work_percent_by_caregiver_role_and_type_chart(home)
+        )
 
         context = prepare_work_by_caregiver_role_and_type_charts(context)
 

manage.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 

pyproject.toml

@@ -5,6 +5,7 @@ description = "Caregiving visualization tool to promote wellness in elder-care c
 authors = ["Brylie Christopher Oxley <[email protected]>"]
 license = "EUPL-1.2"
 readme = "README.md"
+requires-python = ">=3.12,<3.13"
 dependencies = [
     "crispy-bootstrap5>=2023.10,<2024.0",
     "django>=5.0,<6.0",

residents/models.py

@@ -24,7 +24,7 @@ class Resident(models.Model):
 
     @property
     def full_name(self):
-        return f"{ self.first_name } { self.last_initial }"
+        return f"{self.first_name} {self.last_initial}"
 
     class Meta:
         db_table = "resident"
@@ -121,7 +121,7 @@ class Meta:
         verbose_name_plural = _("residencies")
 
     def __str__(self) -> str:
-        return f"{ self.resident.full_name } - { self.home.name }"
+        return f"{self.resident.full_name} - {self.home.name}"
 
     def clean(self) -> None:
         """Ensure residency is valid.