upgrade

Author: domdinicola

pyproject.toml

@@ -19,104 +19,104 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "black>=23",
+  "black>=23,<26",
   "celery[redis]>=5.2.7,<6",
   "coreapi>=2.3.3,<3",
-  "defusedxml==0.7.0rc1",
-  "django>=5.2",
+  "defusedxml==0.7.0rc1",                    # to update
+  "django>=5.2,<5.2.9",
   "django-admin-cursor-paginator>=0.1.3,<1",
-  "django-admin-extra-buttons>=1.5.4,<2",
+  "django-admin-extra-buttons>=1.5.4,<2",    # to update
   "django-admin-sync>=0.7,<1",
   "django-adminactions>=2.1,<3",
-  "django-adminfilters>=2.4.2",
+  "django-adminfilters>=2.4.2,<3",
   "django-advanced-filters>=2,<3",
   "django-auditlog>=2.1.1,<3",
   "django-celery-beat>=2.3,<3",
   "django-celery-results>=2.3.1,<3",
-  "django-compressor>=4.5",
+  "django-compressor>=4.5,<5",
   "django-concurrency>=2.4,<3",
-  "django-constance[redis]>=4.3.2",
-  "django-cors-headers>=3.13,<4",
-  "django-countries>=7.3.2,<8",
-  "django-csp>=3.7,<4",
-  "django-debug-toolbar>=4.3,<5",
+  "django-constance[redis]>=4.3.2,<5",
+  "django-cors-headers>=3.13,<5",
+  "django-countries>=7.3.2,<9",
+  "django-csp>=3.7,<5",
+  "django-debug-toolbar>=4.3,<6.1",          # break triggers
   "django-elasticsearch-dsl>=8,<9",
   "django-environ>=0.10,<1",
-  "django-extensions>=3.1.5,<4",
-  "django-fernet-encrypted-fields>=0.3",
-  "django-filter>=25.1",
+  "django-extensions>=3.1.5,<5",
+  "django-fernet-encrypted-fields>=0.3,<1",
+  "django-filter>=25.1,<26",
   "django-flags>=5.0.12,<6",
   "django-front-door>=0.10,<1",
-  "django-fsm>=2.8,<3",
+  "django-fsm>=2.8,<3",                      # to upgrade
   "django-hijack>=3.2.1,<4",
-  "django-import-export>=2.8,<3",
+  "django-import-export>=2.8,<5",
   "django-import-export-celery>=1.2,<2",
   "django-jsoneditor>=0.2.2,<1",
   "django-markdownify>=0.9.2,<1",
-  "django-model-utils>=4.2,<5",
+  "django-model-utils>=4.2,<6",
   "django-mptt>=0.14,<1",
-  "django-multiselectfield>=1.0.1",
-  "django-phonenumber-field>=7,<8",
+  "django-multiselectfield>=1.0.1,<2",
+  "django-phonenumber-field>=7,<9",
   "django-querysetsequence>=0.16,<1",
-  "django-redis>=5.2,<6",
-  "django-rest-extensions>=0.2",
+  "django-redis>=5.2,<7",
+  "django-rest-extensions>=0.2,<2",
   "django-reversion>=5.0.2,<6",
   "django-silk>=5.0.1,<6",
   "django-smart-admin>=2,<3",
-  "django-smart-env",
-  "django-sql-explorer[xls]>=3,<4",
+  "django-smart-env<2",
+  "django-sql-explorer[xls]>=3,<6",
   "django-storages[azure]>=1.12.3,<2",
   "django-strategy-field>=3,<4",
   "django-sysinfo>=2.6,<3",
   "djangorestframework>=3.13.1,<4",
-  "drf-extensions>=0.7.1",
+  "drf-extensions>=0.7.1,<1",
   "drf-jwt>=1.19.2,<2",
-  "drf-nested-routers~=0.94.0",
+  "drf-nested-routers>=0.94,<1",
   "drf-spectacular[sidecar]>=0.27,<1",
-  "elastic-transport>=8.13",
+  "elastic-transport>=8.13,<9",
   "elasticsearch~=8.14.0",
   "elasticsearch-dsl~=8.14.0",
   "factory-boy>=3,<4",
-  "flower>=2.0.1",
-  "gevent",
-  "gunicorn>=20.1,<21",
-  "ipython>=8.4,<9",
+  "flower>=2.0.1,<3",
+  "gevent<26",
+  "gunicorn>=20.1,<24",
+  "ipython>=8.4,<10",
   "jedi>=0.18.1,<1",
   "jinja2>=3.1.3,<4",
   "jmespath>=1.0.1,<2",
-  "markupsafe>=2.1.1,<3",
-  "msoffcrypto-tool>=5.4.2",
+  "markupsafe>=2.1.1,<4",
+  "msoffcrypto-tool>=5.4.2,<6",
   "natural-keys>=2,<3",
-  "nested-multipart-parser",
-  "openpyxl>=3.1.5",
+  "nested-multipart-parser<2",
+  "openpyxl>=3.1.5,<4",
   "openpyxl-image-loader>=1.0.5,<2",
-  "paramiko>=4",
-  "phonenumbers>=8.12.49,<9",
-  "pillow>=10.2,<11",
+  "paramiko>=4,<5",
+  "phonenumbers>=8.12.49,<10",
+  "pillow>=10.2,<13",
   "prompt-toolkit>=3.0.29,<4",
-  "psycopg2-binary>=2.9.3",
+  "psycopg2-binary>=2.9.3,<3",
   "ptyprocess>=0.7,<1",
-  "pycountry>=22.3,<23",
-  "pydyf>=0.10",
+  "pycountry>=22.3,<25",
+  "pydyf>=0.10,<1",
   "pygments>=2.12,<3",
   "pyjwt>=2.4,<3",
   "pytesseract>=0.3.9,<1",
-  "pytz>=2022.1,<2023",
+  "pytz>=2022.1,<2026",
   "pyyaml>=6,<7",
-  "pyzipper>=0.3.6",
-  "sentry-sdk>=2.37",
-  "setuptools>=71.1",
+  "pyzipper>=0.3.6,<1",
+  "sentry-sdk>=2.37,<3",
+  "setuptools>=71.1,<81",
   "single-source>=0.3,<1",
   "social-auth-app-django>=5,<6",
   "social-auth-core>=4.2,<5",
-  "sorl-thumbnail>=12.11",
+  "sorl-thumbnail>=12.11,<13",
   "swapper>=1.3,<2",
-  "tblib>=1.7,<2",
+  "tblib>=1.7,<4",
   "tomli>=2.0.1,<3",
   "update>=0.0.1,<1",
-  "urllib3>=1.26.9,<2",
-  "weasyprint>=60",
-  "xlrd>=1.2,<2",
+  "urllib3>=1.26.9,<3",
+  "weasyprint>=60,<67",
+  "xlrd>=1.2,<2",                            # to update
 ]
 
 [dependency-groups]

src/frontend/src/containers/pages/grievances/GrievancesDashboardPage.tsx

@@ -9,7 +9,6 @@ import { GrievanceDashboardCard } from '@components/grievances/GrievancesDashboa
 import { TicketsByCategorySection } from '@components/grievances/GrievancesDashboard/sections/TicketsByCategorySection/TicketsByCategorySection';
 import { TicketsByLocationAndCategorySection } from '@components/grievances/GrievancesDashboard/sections/TicketsByLocationAndCategorySection/TicketsByLocationAndCategorySection';
 import { TicketsByStatusSection } from '@components/grievances/GrievancesDashboard/sections/TicketsByStatusSection/TicketsByStatusSection';
-import { hasPermissions, PERMISSIONS } from '../../../config/permissions';
 import { usePermissions } from '@hooks/usePermissions';
 import { useQuery } from '@tanstack/react-query';
 import { RestService } from '@restgenerated/services/RestService';

src/hope/apps/account/templates/admin/account/group/change_list.html

@@ -1,6 +1,5 @@
-{% extends "admin/import_export/change_list.html" %}
-{% load extra_buttons %}
-
+{% extends "admin/change_list.html" %}
+{% load extra_buttons import_export_tags %}
 
 {% block object-tools-items %}
     {% include "admin_extra_buttons/includes/change_list_buttons.html" %}

src/hope/apps/account/templates/admin/account/role/change_list.html

@@ -1,6 +1,5 @@
-{% extends "admin/import_export/change_list.html" %}
-{% load extra_buttons %}
-
+{% extends "admin/change_list.html" %}
+{% load extra_buttons import_export_tags %}  {# required for import_export_buttons #}
 
 {% block object-tools-items %}
     {% include "admin_extra_buttons/includes/change_list_buttons.html" %}

src/hope/apps/payment/services/payment_plan_services.py

@@ -445,7 +445,10 @@ def create_payments(payment_plan: PaymentPlan) -> None:
                 )
             )
         try:
-            Payment.objects.bulk_create(payments_to_create)
+            created_payments = Payment.objects.bulk_create(payments_to_create)
+            # Explicitly refresh unicef_id for bulk created payments
+            for payment in created_payments:
+                payment.refresh_from_db(fields=["unicef_id"])
         except IntegrityError as e:
             raise ValidationError("Duplicated Households in provided Targeting List") from e
         payment_plan.refresh_from_db()

src/hope/apps/program/migrations/0009_migration.py

@@ -21,10 +21,12 @@ class Migration(migrations.Migration):
               END
             ) STORED;
             CREATE INDEX prog_status_rank_id_idx ON program_program (status_rank, id);
-            """,
+            """
+        ),
+        migrations.RunSQL(
             """
             DROP INDEX IF EXISTS prog_status_rank_id_idx;
             ALTER TABLE program_program DROP COLUMN IF EXISTS status_rank;
             """,
-        )
+        ),
     ]

src/hope/apps/steficon/templates/admin/steficon/rule/change_list.html

@@ -1,6 +1,5 @@
-{% extends "admin/import_export/change_list.html" %}
-{% load extra_buttons %}
-
+{% extends "admin/change_list.html" %}
+{% load extra_buttons import_export_tags %}
 
 {% block object-tools-items %}
     {% include "admin_extra_buttons/includes/change_list_buttons.html" %}

tests/unit/apps/payment/test_payment_plan_services.py

@@ -326,7 +326,7 @@ def test_create(self, get_exchange_rate_mock: Any) -> None:
         assert pp.total_households_count == 0
         assert pp.total_individuals_count == 0
         assert pp.payment_items.count() == 0
-        with self.assertNumQueries(97):
+        with self.assertNumQueries(99):
             prepare_payment_plan_task.delay(str(pp.id))
         pp.refresh_from_db()
         assert pp.status == PaymentPlan.Status.TP_OPEN
@@ -790,7 +790,7 @@ def test_full_rebuild(self, get_exchange_rate_mock: Any) -> None:
         assert pp.total_households_count == 0
         assert pp.total_individuals_count == 0
         assert pp.payment_items.count() == 0
-        with self.assertNumQueries(70):
+        with self.assertNumQueries(72):
             prepare_payment_plan_task.delay(str(pp.id))
         pp.refresh_from_db()
         assert pp.status == PaymentPlan.Status.TP_OPEN