Merge pull request #5078 from bcgov/4711-bump-django-to-version-6

4711 bump django to version 6.0.8

Author: Sepehr-Sobhani

bc_obps/bc_obps/settings.py

@@ -100,6 +100,7 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "django.contrib.postgres",
     # Third-party apps
     'simple_history',
     "corsheaders",

bc_obps/poetry.lock

@@ -9,22 +9,22 @@ dynamic = ["dependencies"]
 [tool.poetry]
 [tool.poetry.dependencies]
 python = "~3.14"
-Django = "~5.2.8"
+Django = "~6.0.8"
 python-dotenv = "^1.2.2"
 django-ninja = "~1.6.2"
 psycopg = "^3.1.10"
 psycopg-binary = "^3.1.10"
-django-phonenumber-field = "^7.1.0"
+django-phonenumber-field = "^8.5.0"
 django-phonenumbers = "^1.0.1"
 django-storages = {extras = ["google"], version = "^1.14.6"}
 whitenoise = "^6.5.0"
 django-cors-headers = "4.9.0"
-django-localflavor = "^4.0"
-django-simple-history = "^3.4"
+django-localflavor = "^5.1"
+django-simple-history = "^3.13.0"
 gunicorn = "^23.0.0"
-sentry-sdk = {extras = ["django"], version = "^2.46.0"}
+sentry-sdk = {extras = ["django"], version = "^2.66.1"}
 dj-database-url = "^2.1.0"
-django-pgtrigger = "^4.13.3"
+django-pgtrigger = "^4.17.0"
 weasyprint = "^69.0"
 jsonschema = "^4.23.0"
 types-jsonschema = "^4.23.0.20241208"
@@ -35,18 +35,18 @@ time-machine = "^3.0.0"
 [tool.poetry.group.dev.dependencies]
 black = "^26.3.1"
 pytest = "^9.0.3"
-pytest-django = "^4.11.1"
+pytest-django = "^4.12.0"
 pytest-testmon = "^2.2.0"
 pytest-picked = "^0.5.1"
 model-bakery = "^1.24.0"
-django-extensions = "^3.2.3"
+django-extensions = "^4.1"
 ipdb = "^0.13.13"
 pytest-cov = "^7.1.0"
-django-silk = "^5.1.0"
+django-silk = "^5.5.0"
 pytest-mock = "^3.15.1"
 ruff = "^0.16.0"
-mypy = "^1.10.0"
-django-stubs = {extras = ["compatible-mypy"], version = "^5.0.0"}
+mypy = "^1.13"
+django-stubs = {extras = ["compatible-mypy"], version = "^6.0.7"}
 types-requests = "^2.31.0.20240406"
 pytest-xdist = "^3.8.0"
 django-querycount = "^0.8.3"

bc_obps/pyproject.toml

@@ -17,7 +17,8 @@ def serialize_document(doc: Document | None) -> Optional[str]:
     # Something similar to dataURL to allow passing metadata along with the filename.
     # Required because RJSF expects a string for a file field.
     if doc:
-        name = doc.file.name.split('/')[-1]
+        # Document.file is non-nullable, so name is always set; django-stubs 6.0 types it as str | None.
+        name = doc.file.name.split('/')[-1]  # type: ignore[union-attr]
         return json.dumps({"name": name, "id": doc.id, "status": doc.status})
     return None
 

bc_obps/registration/schema/operation.py

@@ -372,7 +372,8 @@ def save_compliance_data(cls, report_version_id: int) -> None:
             compliance_summary_record_id = ReportComplianceSummary.objects.get(report_version_id=report_version_id).id
 
         compliance_summary_record, _ = ReportComplianceSummary.objects.update_or_create(
-            id=compliance_summary_record_id,
+            # A None id is the intentional "create" path; django-stubs 6.0 rejects None in lookups.
+            id=compliance_summary_record_id,  # type: ignore[misc]
             report_version=report_version_record,
             defaults=compliance_data_to_save.as_record_defaults(),
         )
@@ -387,7 +388,8 @@ def save_compliance_data(cls, report_version_id: int) -> None:
                     product_id=product_data_to_save.product_id,
                 ).id
             ReportComplianceSummaryProduct.objects.update_or_create(
-                id=product_data_id,
+                # A None id is the intentional "create" path; django-stubs 6.0 rejects None in lookups.
+                id=product_data_id,  # type: ignore[misc]
                 report_version=report_version_record,
                 report_compliance_summary=compliance_summary_record,
                 product=RegulatedProduct.objects.get(id=product_data_to_save.product_id),

bc_obps/reporting/service/compliance_service/compliance_service.py

@@ -68,7 +68,8 @@ def save(self, data: dict) -> ReportActivity:
 
         # Only one ReportActivity record per report_version/facility/activity should ever exist
         report_activity, _ = ReportActivity.objects.update_or_create(
-            id=data.get("id"),
+            # A None id is the intentional "create" path; django-stubs 6.0 rejects None in lookups.
+            id=data.get("id"),  # type: ignore[misc]
             report_version=self.report_version,
             facility_report=self.facility_report,
             activity=self.activity,
@@ -121,7 +122,8 @@ def save_source_type(
             raise UserError(f"Source type {source_type_slug} is expecting emission data")
 
         report_source_type, _ = ReportSourceType.objects.update_or_create(
-            id=source_type_data.get("id"),
+            # A None id is the intentional "create" path; django-stubs 6.0 rejects None in lookups.
+            id=source_type_data.get("id"),  # type: ignore[misc]
             report_version=self.facility_report.report_version,
             report_activity=report_activity,
             source_type=source_type,
@@ -171,7 +173,7 @@ def save_unit(self, report_source_type: ReportSourceType, unit_data: dict) -> Re
 
         # Update record if id was provided, create otherwise
         report_unit, _ = ReportUnit.objects.update_or_create(
-            id=report_unit_id,
+            id=report_unit_id,  # type: ignore[misc]
             create_defaults={
                 "json_data": json_data,
                 "report_source_type": report_source_type,
@@ -227,7 +229,7 @@ def save_fuel(
         fuel_type = FuelType.objects.get(name=fuel_name)
 
         report_fuel, _ = ReportFuel.objects.update_or_create(
-            id=report_fuel_id,
+            id=report_fuel_id,  # type: ignore[misc]
             create_defaults={
                 "json_data": json_data,
                 "report_source_type": report_source_type,
@@ -272,7 +274,7 @@ def save_emission(
             raise UserError("Emission is expecting methodology data")
 
         report_emission, _ = ReportEmission.objects.update_or_create(
-            id=report_emission_id,
+            id=report_emission_id,  # type: ignore[misc]
             create_defaults={
                 "json_data": json_data,
                 "report_source_type": report_source_type,
@@ -301,7 +303,7 @@ def save_methodology(
 
         report_methodology_id = methodology_data.get("id")
         report_methodology, _ = ReportMethodology.objects.update_or_create(
-            id=report_methodology_id,
+            id=report_methodology_id,  # type: ignore[misc]
             create_defaults={
                 "methodology": methodology,
                 "json_data": json_data,

bc_obps/reporting/service/report_activity_save_service.py

@@ -39,7 +39,8 @@ def save_report_non_attributable_emissions(
 
             # Using the object attributes instead of .get()
             report_non_attributable, _ = ReportNonAttributableEmissions.objects.update_or_create(
-                id=activity_data.id,
+                # A None id is the intentional "create" path; django-stubs 6.0 rejects None in lookups.
+                id=activity_data.id,  # type: ignore[misc]
                 defaults={
                     "report_version": report_version,
                     "facility_report": facility_report,

bc_obps/reporting/service/report_non_attributable_service.py

@@ -21,7 +21,8 @@ def upsert_address_from_data(
         address_id: Optional[int],
     ) -> Address:
         address, _ = Address.objects.update_or_create(
-            id=address_id,
+            # A None id is the intentional "create" path; django-stubs 6.0 rejects None in lookups.
+            id=address_id,  # type: ignore[misc]
             defaults={**address_data},
         )
         return address

bc_obps/service/data_access_service/address_service.py

@@ -10,7 +10,8 @@ def create_or_update(
         cls, multiple_operator_id: int | None, operation: Operation, user_guid: UUID, data: DictStrAny
     ) -> MultipleOperator:
         mo_operator_instance, _ = MultipleOperator.objects.update_or_create(
-            pk=multiple_operator_id,
+            # A None pk is the intentional "create" path; django-stubs 6.0 rejects None in lookups.
+            pk=multiple_operator_id,  # type: ignore[misc]
             defaults={**data, 'operation': operation},
         )
 

bc_obps/service/data_access_service/multiple_operator_service.py

@@ -48,7 +48,7 @@ def get_operation_timeline_for_user(
                 operation_id=OuterRef('operation'),
                 operation_id__type=Operation.Types.SFO,
             )
-            .only('facility__pk', 'facility__name')
+            .only('facility__id', 'facility__name')
             .order_by('start_date')
         )
         if exclude_previously_owned: