Merge pull request #170 from knikolla/pins_2025-11-12

Update pins for Nov 11 upgrade

Author: jtriley

Dockerfile

@@ -23,15 +23,11 @@ COPY requirements.txt /tmp/requirements.txt
 RUN pip3 install -r /tmp/requirements.txt
 
 COPY patches/01_add_api_urls.patch /opt/venv/lib/python3.12/site-packages/
-COPY patches/02_fix_allocation_denied_revoked_PR596.patch /opt/venv/lib/python3.12/site-packages/
 COPY patches/03_add_active_needs_renewal_status.patch /opt/venv/lib/python3.12/site-packages/
-COPY patches/04_add_allocation_change_request_created_signal.patch /opt/venv/lib/python3.12/site-packages/
 
 RUN cd /opt/venv/lib/python3.12/site-packages && \
     patch -p1 < 01_add_api_urls.patch && \
-    patch -p1 < 02_fix_allocation_denied_revoked_PR596.patch && \
-    patch -p1 < 03_add_active_needs_renewal_status.patch && \
-    patch -p1 < 04_add_allocation_change_request_created_signal.patch
+    patch -p1 < 03_add_active_needs_renewal_status.patch
 
 # Final Image
 FROM python:3.12-slim-bullseye

patches/01_add_api_urls.patch

@@ -1,11 +1,14 @@
 diff --git a/coldfront/config/urls.py b/coldfront/config/urls.py
-index 353e360..220378a 100644
+index 78d9589..f1cd16a 100644
 --- a/coldfront/config/urls.py
 +++ b/coldfront/config/urls.py
-@@ -36,3 +36,6 @@ if 'mozilla_django_oidc' in settings.INSTALLED_APPS:
- 
- if 'django_su.backends.SuBackend' in settings.AUTHENTICATION_BACKENDS:
-     urlpatterns.append(path('su/', include('django_su.urls')))
-+
+@@ -52,6 +52,9 @@ if "mozilla_django_oidc" in settings.INSTALLED_APPS:
+ if "django_su.backends.SuBackend" in settings.AUTHENTICATION_BACKENDS:
+     urlpatterns.append(path("su/", include("django_su.urls")))
+
 +if 'coldfront_plugin_api' in settings.INSTALLED_APPS:
 +    urlpatterns.append(path('api/', include('coldfront_plugin_api.urls')))
++
+
+ def export_as_json(modeladmin, request, queryset):
+     response = HttpResponse(content_type="application/json")

patches/02_fix_allocation_denied_revoked_PR596.patch

@@ -1,26 +1,25 @@
 diff --git a/coldfront/core/allocation/management/commands/add_allocation_defaults.py b/coldfront/core/allocation/management/commands/add_allocation_defaults.py
-index ca5c4fc..556eeb2 100644
+index 9f7dc01..3fd2fa7 100644
 --- a/coldfront/core/allocation/management/commands/add_allocation_defaults.py
 +++ b/coldfront/core/allocation/management/commands/add_allocation_defaults.py
-@@ -16,7 +16,7 @@ class Command(BaseCommand):
-             'Attribute Expanded Text'):
-             AttributeType.objects.get_or_create(name=attribute_type)
- 
--        for choice in ('Active', 'Denied', 'Expired',
-+        for choice in ('Active (Needs Renewal)', 'Active', 'Denied', 'Expired',
-                        'New', 'Paid', 'Payment Pending',
-                        'Payment Requested', 'Payment Declined',
-                        'Renewal Requested', 'Revoked', 'Unpaid',):
+@@ -22,6 +22,7 @@ class Command(BaseCommand):
+
+         for choice in (
+             "Active",
++            "Active (Needs Renewal)",
+             "Denied",
+             "Expired",
+             "New",
 diff --git a/coldfront/core/allocation/tasks.py b/coldfront/core/allocation/tasks.py
-index e1a37fc..ba96800 100644
+index 883420a..3247ce3 100644
 --- a/coldfront/core/allocation/tasks.py
 +++ b/coldfront/core/allocation/tasks.py
-@@ -29,7 +29,7 @@ EMAIL_ADMIN_LIST = import_from_settings('EMAIL_ADMIN_LIST')
+@@ -36,7 +36,7 @@ EMAIL_ALLOCATION_EULA_IGNORE_OPT_OUT = import_from_settings("EMAIL_ALLOCATION_EU
+
+
  def update_statuses():
- 
-     expired_status_choice = AllocationStatusChoice.objects.get(
--        name='Expired')
-+        name='Active (Needs Renewal)')
+-    expired_status_choice = AllocationStatusChoice.objects.get(name="Expired")
++    expired_status_choice = AllocationStatusChoice.objects.get(name="Active (Needs Renewal)")
      allocations_to_expire = Allocation.objects.filter(
-         status__name__in=['Active','Payment Pending','Payment Requested', 'Unpaid',], end_date__lt=datetime.datetime.now().date())
-     for sub_obj in allocations_to_expire:
+         status__name__in=[
+             "Active",

patches/03_add_active_needs_renewal_status.patch

@@ -1,7 +1,7 @@
-git+https://github.com/ubccr/coldfront@v1.1.6#egg=coldfront
-git+https://github.com/nerc-project/coldfront-plugin-cloud@v0.10.1#egg=coldfront_plugin_cloud
+git+https://github.com/ubccr/coldfront@v1.1.7#egg=coldfront
+git+https://github.com/nerc-project/coldfront-plugin-cloud@v0.10.2#egg=coldfront_plugin_cloud
 git+https://github.com/nerc-project/coldfront-plugin-keycloak@d5f02df7bef5b4ab787d3ebb21cd11f3c133138f#egg=coldfront_plugin_keycloak_usersearch
-git+https://github.com/nerc-project/coldfront-plugin-api.git@v0.2.2#egg=coldfront_plugin_api
+git+https://github.com/nerc-project/coldfront-plugin-api.git@v0.2.3#egg=coldfront_plugin_api
 mysqlclient
 psycopg2
 mozilla-django-oidc