Merge pull request #4764 from alphagov/relax-some-pins

Relax some pins using compatible version operator and re-freeze

Author: quis

app/celery/process_ses_receipts_tasks.py

@@ -1,7 +1,6 @@
 import logging
 from datetime import datetime, timedelta
 
-import iso8601
 from celery.exceptions import Retry
 from flask import current_app, json
 from sqlalchemy.orm.exc import NoResultFound
@@ -42,7 +41,7 @@ def process_ses_results(self, response):
         try:
             notification = notifications_dao.dao_get_notification_or_history_by_reference(reference=reference)
         except NoResultFound:
-            message_time = iso8601.parse_date(ses_message["mail"]["timestamp"]).replace(tzinfo=None)
+            message_time = datetime.fromisoformat(ses_message["mail"]["timestamp"]).replace(tzinfo=None)
             if datetime.utcnow() - message_time < timedelta(minutes=5):
                 extra = {"notification_reference": reference, "notification_status": notification_status}
                 current_app.logger.info(

app/notifications/receive_notifications.py

@@ -1,7 +1,6 @@
 from datetime import datetime
 from urllib.parse import unquote
 
-import iso8601
 from flask import Blueprint, abort, current_app, jsonify, request
 from gds_metrics.metrics import Counter
 
@@ -142,9 +141,9 @@ def format_mmg_datetime(date):
     """
     try:
         orig_date = format_mmg_message(date)
-        parsed_datetime = iso8601.parse_date(orig_date).replace(tzinfo=None)
+        parsed_datetime = datetime.fromisoformat(orig_date).replace(tzinfo=None)
         return parsed_datetime
-    except iso8601.ParseError:
+    except ValueError:
         return datetime.utcnow()
 
 

app/schema_validation/__init__.py

@@ -3,7 +3,6 @@
 from datetime import datetime, timedelta
 from uuid import UUID
 
-from iso8601 import ParseError, iso8601
 from jsonschema import Draft7Validator, FormatChecker, ValidationError
 from notifications_utils.recipient_validation.email_address import validate_email_address
 from notifications_utils.recipient_validation.errors import InvalidEmailError, InvalidPhoneError
@@ -67,12 +66,12 @@ def validate_schema_postage_including_international(instance):
 def validate_schema_date_with_hour(instance):
     if isinstance(instance, str):
         try:
-            dt = iso8601.parse_date(instance).replace(tzinfo=None)
+            dt = datetime.fromisoformat(instance).replace(tzinfo=None)
             if dt < datetime.utcnow():
                 raise ValidationError("datetime can not be in the past")
             if dt > datetime.utcnow() + timedelta(hours=24):
                 raise ValidationError("datetime can only be 24 hours in the future")
-        except ParseError as e:
+        except ValueError as e:
             raise ValidationError(
                 "datetime format is invalid. It must be a valid ISO8601 date time format, "
                 "https://en.wikipedia.org/wiki/ISO_8601"

requirements.in

@@ -4,21 +4,20 @@
 celery[sqs]==5.6.0
 # Pin kombu to merge of PR #2342 (SQS fair queue / MessageGroupId support) until kombu 5.7 is released
 kombu @ git+https://github.com/celery/kombu.git@860e40a6c904c4d8551577d9f4e8c00f03b6e06c
-Flask-Bcrypt==1.0.1
+Flask-Bcrypt~=1.0
 flask-marshmallow==1.3.0
 Flask-Migrate==3.1.0
 flask-sqlalchemy==3.1.1
-click-datetime==0.2
+click-datetime~=0.2
 gunicorn[eventlet]~=25.1
 eventlet~=0.40.4
-iso8601==2.1.0
 jsonschema[format]==4.23.0
 marshmallow-sqlalchemy==1.0.0
 marshmallow==3.21.3
 psycopg2-binary==2.9.10
 PyJWT==2.10.1
 SQLAlchemy==2.0.41
-pyorc==0.10.0
+pyorc~=0.10
 
 # temporary for debug output
 psutil>=6.0.0,<7.0.0
@@ -30,4 +29,4 @@ notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@11
 
 git+https://github.com/alphagov/gds_metrics_python.git@6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72
 
-sentry-sdk[flask,celery,sqlalchemy]==1.45.1
+sentry-sdk[flask,celery,sqlalchemy]~=1.45

requirements.txt

@@ -21,16 +21,16 @@ blinker==1.9.0
     #   flask
     #   gds-metrics
     #   sentry-sdk
-boto3==1.42.56
+boto3==1.42.60
     # via
     #   celery
     #   kombu
     #   notifications-utils
-botocore==1.42.56
+botocore==1.42.60
     # via
     #   boto3
     #   s3transfer
-cachetools==7.0.1
+cachetools==7.0.2
     # via notifications-utils
 celery==5.6.0
     # via
@@ -50,7 +50,7 @@ click==8.3.1
     #   click-plugins
     #   click-repl
     #   flask
-click-datetime==0.2
+click-datetime==0.4.0
     # via -r requirements.in
 click-didyoumean==0.3.1
     # via celery
@@ -94,7 +94,7 @@ fqdn==1.5.1
     # via jsonschema
 gds-metrics @ git+https://github.com/alphagov/gds_metrics_python.git@6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72
     # via -r requirements.in
-govuk-bank-holidays==0.18
+govuk-bank-holidays==0.19
     # via notifications-utils
 greenlet==3.3.2
     # via eventlet
@@ -106,8 +106,6 @@ idna==3.11
     # via
     #   jsonschema
     #   requests
-iso8601==2.1.0
-    # via -r requirements.in
 isoduration==20.11.0
     # via jsonschema
 itsdangerous==2.2.0
@@ -161,7 +159,7 @@ packaging==26.0
     #   gunicorn
     #   kombu
     #   marshmallow
-phonenumbers==9.0.24
+phonenumbers==9.0.25
     # via notifications-utils
 prometheus-client==0.24.1
     # via gds-metrics
@@ -181,7 +179,7 @@ pyjwt==2.10.1
     #   notifications-python-client
 pyorc==0.10.0
     # via -r requirements.in
-pypdf==6.7.3
+pypdf==6.7.5
     # via notifications-utils
 python-dateutil==2.9.0.post0
     # via
@@ -193,7 +191,7 @@ python-json-logger==4.0.0
     # via notifications-utils
 pyyaml==6.0.3
     # via notifications-utils
-redis==7.2.0
+redis==7.2.1
     # via flask-redis
 referencing==0.37.0
     # via
@@ -263,3 +261,5 @@ webcolors==25.10.0
     # via jsonschema
 werkzeug==3.1.6
     # via flask
+wheel==0.44.0
+    # via click-datetime

requirements_for_test.txt

@@ -36,18 +36,18 @@ blinker==1.9.0
     #   -r requirements.txt
     #   flask
     #   gds-metrics
-boto3==1.42.56
+boto3==1.42.60
     # via
     #   -r requirements.txt
     #   moto
     #   notifications-utils
-botocore==1.42.56
+botocore==1.42.60
     # via
     #   -r requirements.txt
     #   boto3
     #   moto
     #   s3transfer
-cachetools==7.0.1
+cachetools==7.0.2
     # via
     #   -r requirements.txt
     #   notifications-utils
@@ -73,7 +73,7 @@ click==8.3.1
     #   click-plugins
     #   click-repl
     #   flask
-click-datetime==0.2
+click-datetime==0.4.0
     # via -r requirements.txt
 click-didyoumean==0.3.1
     # via
@@ -143,7 +143,7 @@ freezegun==1.5.5
     # via -r requirements_for_test_common.in
 gds-metrics @ git+https://github.com/alphagov/gds_metrics_python.git@6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72
     # via -r requirements.txt
-govuk-bank-holidays==0.18
+govuk-bank-holidays==0.19
     # via
     #   -r requirements.txt
     #   notifications-utils
@@ -162,8 +162,6 @@ idna==3.11
     #   trustme
 iniconfig==2.3.0
     # via pytest
-iso8601==2.1.0
-    # via -r requirements.txt
 isoduration==20.11.0
     # via -r requirements.txt
 itsdangerous==2.2.0
@@ -241,7 +239,7 @@ packaging==26.0
     #   pytest
 pathspec==1.0.4
     # via mypy
-phonenumbers==9.0.24
+phonenumbers==9.0.25
     # via
     #   -r requirements.txt
     #   notifications-utils
@@ -271,7 +269,7 @@ pyjwt==2.10.1
     #   notifications-python-client
 pyorc==0.10.0
     # via -r requirements.txt
-pypdf==6.7.3
+pypdf==6.7.5
     # via
     #   -r requirements.txt
     #   notifications-utils
@@ -301,7 +299,7 @@ python-dateutil==2.9.0.post0
     #   freezegun
     #   moto
     #   notifications-utils
-python-dotenv==1.2.1
+python-dotenv==1.2.2
     # via pytest-env
 python-json-logger==4.0.0
     # via
@@ -312,7 +310,7 @@ pyyaml==6.0.3
     #   -r requirements.txt
     #   notifications-utils
     #   responses
-redis==7.2.0
+redis==7.2.1
     # via
     #   -r requirements.txt
     #   flask-redis
@@ -372,7 +370,7 @@ sqlalchemy==2.0.41
     #   alembic
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
-squawk-cli==2.42.0
+squawk-cli==2.43.0
     # via -r requirements_for_test.in
 statsd==4.0.1
     # via
@@ -384,7 +382,7 @@ types-cachetools==6.2.0.20251022
     # via -r requirements_for_test.in
 types-pycurl==7.45.7.20251101
     # via -r requirements_for_test.in
-types-python-dateutil==2.9.0.20260124
+types-python-dateutil==2.9.0.20260302
     # via -r requirements_for_test.in
 types-requests==2.32.4.20260107
     # via -r requirements_for_test.in
@@ -432,5 +430,9 @@ werkzeug==3.1.6
     #   flask
     #   moto
     #   pytest-httpserver
+wheel==0.44.0
+    # via
+    #   -r requirements.txt
+    #   click-datetime
 xmltodict==1.0.4
     # via moto