DWPF-1473 Update python packages (#496)

I have managed to upgrade all of the python packages to their latest version. Along the way I also: - upgraded python to 3.12 - moved the project from flake8 to ruff - resolved many issues raised by ruff - fixed a few potential bugs - removed a couple of dependencies Co-authored-by: Sam Dudley <[email protected]>
uktrade · Mar 28, 2024 · 3f51c91 · 3f51c91
1 parent c0a912a
commit 3f51c91
Show file tree

Hide file tree

Showing 67 changed files with 1,019 additions and 930 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - uses: actions/setup-node@v4
         with:
@@ -34,8 +34,8 @@ jobs:
       - name: Collect static
         run: make collectstatic
 
-      - name: Run Flake8
-        run: make flake8
+      - name: Run ruff
+        run: make ruff
 
       - name: Run isort
         run: make isort-check

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 nodejs 20.11.1
-python 3.10.13
+python 3.12.2
diff --git a/chartofaccountDIT/exportcsv.py b/chartofaccountDIT/exportcsv.py
@@ -33,24 +33,36 @@ def _export_nac_iterator(queryset):
             obj.natural_account_code_description,
         ] + l5_field_obj(obj.account_L5_code) + [
             obj.used_for_budget,
-            obj.expenditure_category.NAC_category.NAC_category_description
-            if obj.expenditure_category
-            else "-",
-            obj.expenditure_category.grouping_description
-            if obj.expenditure_category
-            else "-",
-            obj.commercial_category.commercial_category
-            if obj.commercial_category
-            else "N/A",
-            obj.expenditure_category.op_del_category.operating_delivery_description
-            if obj.expenditure_category and obj.expenditure_category.op_del_category
-            else "N/A",
-            obj.expenditure_category.linked_budget_code.natural_account_code
-            if obj.expenditure_category
-            else "-",
-            obj.expenditure_category.NAC_category.get_pay_nonpay_display()
-            if obj.expenditure_category
-            else "N/A",
+            (
+                obj.expenditure_category.NAC_category.NAC_category_description
+                if obj.expenditure_category
+                else "-"
+            ),
+            (
+                obj.expenditure_category.grouping_description
+                if obj.expenditure_category
+                else "-"
+            ),
+            (
+                obj.commercial_category.commercial_category
+                if obj.commercial_category
+                else "N/A"
+            ),
+            (
+                obj.expenditure_category.op_del_category.operating_delivery_description
+                if obj.expenditure_category and obj.expenditure_category.op_del_category
+                else "N/A"
+            ),
+            (
+                obj.expenditure_category.linked_budget_code.natural_account_code
+                if obj.expenditure_category
+                else "-"
+            ),
+            (
+                obj.expenditure_category.NAC_category.get_pay_nonpay_display()
+                if obj.expenditure_category
+                else "N/A"
+            ),
             obj.get_cash_non_cash_display(),
             obj.get_gross_income_display(),
             obj.active,
@@ -81,9 +93,11 @@ def _export_historical_nac_iterator(queryset):
             obj.natural_account_code,
             obj.natural_account_code_description,
             obj.used_for_budget,
-            obj.expenditure_category.grouping_description
-            if obj.expenditure_category
-            else "-",
+            (
+                obj.expenditure_category.grouping_description
+                if obj.expenditure_category
+                else "-"
+            ),
             obj.NAC_category,
             obj.commercial_category,
             obj.account_L5_code,
@@ -117,9 +131,11 @@ def _export_exp_cat_iterator(queryset):
             obj.further_description,
             obj.linked_budget_code.natural_account_code,
             obj.linked_budget_code.natural_account_code_description,
-            obj.op_del_category.operating_delivery_description
-            if obj.op_del_category
-            else "-",
+            (
+                obj.op_del_category.operating_delivery_description
+                if obj.op_del_category
+                else "-"
+            ),
         ]
 
 

diff --git a/chartofaccountDIT/test/factories.py b/chartofaccountDIT/test/factories.py
@@ -26,7 +26,7 @@
 )
 
 
-class Analysis1Factory(factory.DjangoModelFactory):
+class Analysis1Factory(factory.django.DjangoModelFactory):
     """
     Define Analysis1 Factory
     """
@@ -37,12 +37,12 @@ class Meta:
     active = True
 
 
-class HistoricalAnalysis1Factory(factory.DjangoModelFactory):
+class HistoricalAnalysis1Factory(factory.django.DjangoModelFactory):
     class Meta:
         model = ArchivedAnalysis1
 
 
-class Analysis2Factory(factory.DjangoModelFactory):
+class Analysis2Factory(factory.django.DjangoModelFactory):
     """
     Define Analysis2 Factory
     """
@@ -53,12 +53,12 @@ class Meta:
     active = True
 
 
-class HistoricalAnalysis2Factory(factory.DjangoModelFactory):
+class HistoricalAnalysis2Factory(factory.django.DjangoModelFactory):
     class Meta:
         model = ArchivedAnalysis2
 
 
-class NACCategoryFactory(factory.DjangoModelFactory):
+class NACCategoryFactory(factory.django.DjangoModelFactory):
     """
     Define NACCategory Factory
     """
@@ -69,7 +69,7 @@ class Meta:
     NAC_category_description = factory.Faker("name")
 
 
-class OperatingDeliveryCategoryFactory(factory.DjangoModelFactory):
+class OperatingDeliveryCategoryFactory(factory.django.DjangoModelFactory):
     """
     Define OperatingDeliveryCategory Factory
     """
@@ -78,7 +78,7 @@ class Meta:
         model = OperatingDeliveryCategory
 
 
-class ExpenditureCategoryFactory(factory.DjangoModelFactory):
+class ExpenditureCategoryFactory(factory.django.DjangoModelFactory):
     """
     Define ExpenditureCategory Factory
     """
@@ -90,14 +90,14 @@ class Meta:
         model = ExpenditureCategory
 
 
-class HistoricalExpenditureCategoryFactory(factory.DjangoModelFactory):
+class HistoricalExpenditureCategoryFactory(factory.django.DjangoModelFactory):
     grouping_description = "Test Archived Budget Category"
 
     class Meta:
         model = ArchivedExpenditureCategory
 
 
-class CommercialCategoryFactory(factory.DjangoModelFactory):
+class CommercialCategoryFactory(factory.django.DjangoModelFactory):
     """
     Define CommercialCategory Factory
     """
@@ -108,14 +108,14 @@ class Meta:
         model = CommercialCategory
 
 
-class HistoricalCommercialCategoryFactory(factory.DjangoModelFactory):
+class HistoricalCommercialCategoryFactory(factory.django.DjangoModelFactory):
     active = True
 
     class Meta:
         model = ArchivedCommercialCategory
 
 
-class NaturalCodeFactory(factory.DjangoModelFactory):
+class NaturalCodeFactory(factory.django.DjangoModelFactory):
     """
     Define NaturalCode Factory
     """
@@ -130,7 +130,7 @@ class Meta:
     used_for_budget = False
 
 
-class HistoricalNaturalCodeFactory(factory.DjangoModelFactory):
+class HistoricalNaturalCodeFactory(factory.django.DjangoModelFactory):
 
     active = True
     natural_account_code = 87654321
@@ -141,7 +141,7 @@ class Meta:
         model = ArchivedNaturalCode
 
 
-class ProgrammeCodeFactory(factory.DjangoModelFactory):
+class ProgrammeCodeFactory(factory.django.DjangoModelFactory):
     """
     Define ProgrammeCode Factory
     """
@@ -156,7 +156,7 @@ class Meta:
     budget_type = factory.Iterator(BudgetType.objects.all())
 
 
-class HistoricalProgrammeCodeFactory(factory.DjangoModelFactory):
+class HistoricalProgrammeCodeFactory(factory.django.DjangoModelFactory):
     """
     Define ArchivedProgrammeCode Factory
     """
@@ -170,7 +170,7 @@ class Meta:
         model = ArchivedProgrammeCode
 
 
-class InterEntityL1Factory(factory.DjangoModelFactory):
+class InterEntityL1Factory(factory.django.DjangoModelFactory):
     """
     Define InterEntityL1 Factory
     """
@@ -179,7 +179,7 @@ class Meta:
         model = InterEntityL1
 
 
-class InterEntityFactory(factory.DjangoModelFactory):
+class InterEntityFactory(factory.django.DjangoModelFactory):
     """
     Define InterEntity Factory
     """
@@ -191,14 +191,14 @@ class Meta:
         model = InterEntity
 
 
-class HistoricalInterEntityFactory(factory.DjangoModelFactory):
+class HistoricalInterEntityFactory(factory.django.DjangoModelFactory):
     active = True
 
     class Meta:
         model = ArchivedInterEntity
 
 
-class ProjectCodeFactory(factory.DjangoModelFactory):
+class ProjectCodeFactory(factory.django.DjangoModelFactory):
     """
     Define ProjectCode Factory
     """
@@ -212,7 +212,7 @@ class Meta:
     project_description = "Project Description"
 
 
-class HistoricalProjectCodeFactory(factory.DjangoModelFactory):
+class HistoricalProjectCodeFactory(factory.django.DjangoModelFactory):
     """
     Define ArchivedProjectCode Factory
     """
@@ -225,7 +225,7 @@ class Meta:
         model = ArchivedProjectCode
 
 
-class FCOMappingFactory(factory.DjangoModelFactory):
+class FCOMappingFactory(factory.django.DjangoModelFactory):
     """
     Define FCOMapping Factory
     """
@@ -238,7 +238,7 @@ class Meta:
         model = FCOMapping
 
 
-class HistoricalFCOMappingFactory(factory.DjangoModelFactory):
+class HistoricalFCOMappingFactory(factory.django.DjangoModelFactory):
     """
     Define ArchivedFCOMapping Factory
     """

diff --git a/config/settings/base.py b/config/settings/base.py
@@ -20,7 +20,7 @@
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
 env = environ.Env()
-env.read_env()
+environ.Env.read_env(BASE_DIR / ".env")
 
 DEBUG = env.bool("DEBUG", default=False)
 

diff --git a/config/settings/dev.py b/config/settings/dev.py
@@ -26,11 +26,8 @@
 
 CACHES = {
     "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
+        "BACKEND": "django.core.cache.backends.redis.RedisCache",
         "LOCATION": CELERY_BROKER_URL,
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        },
         "KEY_PREFIX": "cache_",
     }
 }

diff --git a/config/settings/prod.py b/config/settings/prod.py
@@ -29,11 +29,8 @@
 
 CACHES = {
     "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
+        "BACKEND": "django.core.cache.backends.redis.RedisCache",
         "LOCATION": CELERY_BROKER_URL,
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        },
         "KEY_PREFIX": "cache_",
     }
 }

diff --git a/config/urls.py b/config/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.conf import settings
 from django.contrib import admin
 from django.urls import include, path

diff --git a/core/import_csv.py b/core/import_csv.py
@@ -60,10 +60,10 @@ def add_position(d, h):
     dictionary inside"""
     c = {}
     for k, v in d.items():
-        if type(v) is dict:
+        if isinstance(v, dict):
             c[k] = add_position(v, h)
         else:
-            if type(v) is str:
+            if isinstance(v, str):
                 v = v.lower()
             if v in h:
                 c[k] = h[v]
@@ -145,7 +145,7 @@ def read_csv_from_dict(d, row, year):
 
     default_list = {}
     for k, v in d[IMPORT_CSV_FIELDLIST_KEY].items():
-        if type(v) is dict:
+        if isinstance(v, dict):
             default_list[k], errormsg = read_csv_from_dict(v, row, year)
         else:
             default_list[k] = get_value_from_field(
@@ -185,8 +185,8 @@ def get_col_from_obj_key(obj_key):
     if IMPORT_CSV_IS_FK in obj_key:
         header_list.append(obj_key[IMPORT_CSV_IS_FK])
     if IMPORT_CSV_FIELDLIST_KEY in obj_key:
-        for k, v in obj_key[IMPORT_CSV_FIELDLIST_KEY].items():
-            if type(v) is dict:
+        for _, v in obj_key[IMPORT_CSV_FIELDLIST_KEY].items():
+            if isinstance(v, dict):
                 header_list = header_list + get_col_from_obj_key(v)
             else:
                 header_list.append(v)
@@ -254,13 +254,22 @@ class ImportInfo:
 
     def __init__(
         self,
-        key={},
+        key=None,
         title="",
-        h_list=[],
+        h_list=None,
         special_import_func=None,
-        filter=[],
+        filter=None,
         extra_func=None,
     ):
+        if key is None:
+            key = {}
+
+        if h_list is None:
+            h_list = []
+
+        if filter is None:
+            filter = []
+
         self.key = key
         self.special_func = special_import_func
         if bool(key):
@@ -328,7 +337,7 @@ def get_field_name(obj_key, prefix):
         field_list.append(prefix + model._meta.pk.name)
     if IMPORT_CSV_FIELDLIST_KEY in obj_key:
         for k, v in obj_key[IMPORT_CSV_FIELDLIST_KEY].items():
-            if type(v) is dict:
+            if isinstance(v, dict):
                 field_list = field_list + get_field_name(v, prefix + k + "__")
             else:
                 field_list.append(prefix + k)