PPHA-534: Use inflection over pyhumps

Author: Themitchell

lung_cancer_screening/jinja2_env.py

@@ -1,8 +1,7 @@
-import inflection
-
 from django.conf import settings
 from django.templatetags.static import static
 from django.urls import reverse
+from inflection import singularize
 from jinja2 import ChoiceLoader, Environment, PackageLoader
 
 
@@ -31,7 +30,7 @@ def environment(**options):
     )
 
     env.filters.update(
-        {"singularize": inflection.singularize}
+        {"singularize": singularize}
     )
 
     return env

lung_cancer_screening/questions/presenters/response_set_presenter.py

@@ -1,8 +1,6 @@
-import humps
-import inflection
-
 from decimal import Decimal
 from django.urls import reverse
+from inflection import dasherize, singularize
 
 from ..models.education_response import EducationValues
 from ..models.respiratory_conditions_response import RespiratoryConditionValues
@@ -250,11 +248,10 @@ def family_history_responses_items(self):
 
         return items
 
-
     def smoking_history_types_responses_items(self):
         items = []
         for type_history in self.response_set.tobacco_smoking_history.in_form_order():
-            tobacco_type_kwargs = {"tobacco_type": humps.kebabize(type_history.type)}
+            tobacco_type_kwargs = {"tobacco_type": dasherize(type_history.type).lower()}
             type_label = type_history.human_type().lower()
 
             items.append(self._check_your_answer_item(
@@ -264,7 +261,7 @@ def smoking_history_types_responses_items(self):
                 kwargs=tobacco_type_kwargs,
             ))
             items.append(self._check_your_answer_item(
-                f"Current {inflection.singularize(type_label)} smoking",
+                f"Current {singularize(type_label)} smoking",
                 f"{type_history.smoked_amount_response.value} {type_label} per day" if hasattr(type_history, 'smoked_amount_response') else None,
                 "questions:smoked_amount",
                 kwargs=tobacco_type_kwargs,

lung_cancer_screening/questions/tests/unit/presenters/test_response_set_presenter.py

@@ -1,7 +1,6 @@
-import humps
-
 from django.test import TestCase, tag
 from django.urls import reverse
+from inflection import dasherize
 
 from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
@@ -492,9 +491,9 @@ def test_smoking_history_types_responses_items_sets_the_correct_change_link(self
             reverse(
                 "questions:smoked_total_years",
                 kwargs={
-                    "tobacco_type": humps.kebabize(
+                    "tobacco_type": dasherize(
                         TobaccoSmokingHistoryTypes.CIGARETTES
-                    )
+                    ).lower()
                 },
                 query={"change": "True"},
             ),

lung_cancer_screening/questions/tests/unit/views/test_types_tobacco_smoking.py

@@ -1,7 +1,6 @@
-import humps
-
 from django.test import TestCase, tag
 from django.urls import reverse
+from inflection import dasherize
 
 from .helpers.authentication import login_user
 from ...factories.response_set_factory import ResponseSetFactory
@@ -127,5 +126,5 @@ def test_post_redirects_to_the_first_type_of_tobacco_smoking_history_question(se
         )
 
         self.assertRedirects(response, reverse("questions:smoked_total_years", kwargs={
-            "tobacco_type": humps.kebabize(TobaccoSmokingHistoryTypes.CIGARETTES.value)
+            "tobacco_type": dasherize(TobaccoSmokingHistoryTypes.CIGARETTES.value).lower()
         }), fetch_redirect_response=False)

lung_cancer_screening/questions/views/mixins/ensure_smoking_history_for_type.py

@@ -1,10 +1,10 @@
-import humps
+from inflection import camelize
 from django.http import Http404
 
 class EnsureSmokingHistoryForTypeMixin:
 
     def dispatch(self, request, *args, **kwargs):
-        url_tobacco_type = humps.pascalize(kwargs["tobacco_type"])
+        url_tobacco_type = camelize(kwargs["tobacco_type"])
 
 
         if request.response_set.tobacco_smoking_history.filter(type=url_tobacco_type).exists():

lung_cancer_screening/questions/views/smoking_history_question_base_view.py

@@ -1,4 +1,5 @@
-import humps
+from inflection import camelize
+
 from .question_base_view import QuestionBaseView
 
 class SmokingHistoryQuestionBaseView(QuestionBaseView):
@@ -9,5 +10,5 @@ def get_object(self):
 
     def _get_history_item_for_type(self):
         return self.request.response_set.tobacco_smoking_history.filter(
-            type=humps.pascalize(self.kwargs["tobacco_type"])
+            type=camelize(self.kwargs["tobacco_type"])
         ).first()

lung_cancer_screening/questions/views/types_tobacco_smoking.py

@@ -1,8 +1,7 @@
-import humps
-
 from django.urls import reverse
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.views.generic.edit import FormView
+from inflection import dasherize
 
 from .mixins.ensure_response_set import EnsureResponseSet
 from .mixins.ensure_eligible import EnsureEligibleMixin
@@ -35,8 +34,8 @@ def get_success_url(self):
         return reverse(
             "questions:smoked_total_years",
             kwargs={
-                "tobacco_type": humps.kebabize(
+                "tobacco_type": dasherize(
                     self.request.response_set.tobacco_smoking_history.first().type
-                )
+                ).lower()
             },
         )

poetry.lock

@@ -17,7 +17,6 @@ dependencies = [
     "mozilla-django-oidc (>=3.0.0,<4.0.0)",
     "pyjwt (>=2.8.0,<3.0.0)",
     "cryptography (>=46.0.3)",
-    "pyhumps (>=3.8.0,<4.0.0)",
     "inflection (>=0.5.1,<0.6.0)",
 ]