Merge pull request #5611 from alphagov/remove-pytz

Remove `pytz`

Author: quis

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-# This file was automatically copied from notifications-utils@101.3.1
+# This file was automatically copied from notifications-utils@102.0.0
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks

app/main/forms.py

@@ -7,7 +7,6 @@
 from math import ceil
 from numbers import Number
 
-import pytz
 from flask import request
 from flask_login import current_user
 from flask_wtf import FlaskForm as Form
@@ -134,7 +133,7 @@ def get_next_hours_until(until):
     now = datetime.now(UTC)
     hours = ceil((until - now).total_seconds() / (60 * 60))
     return [
-        (now + timedelta(hours=i)).replace(minute=0, second=0, microsecond=0).replace(tzinfo=pytz.utc)
+        (now + timedelta(hours=i)).replace(minute=0, second=0, microsecond=0).replace(tzinfo=UTC)
         for i in range(1, hours + 1)
     ]
 
@@ -144,7 +143,7 @@ def get_next_days_until(until):
     days = int((until - now).total_seconds() / (60 * 60 * 24))
 
     return [
-        get_human_day((now + timedelta(days=i)).replace(tzinfo=pytz.utc), include_day_of_week=True).title()
+        get_human_day((now + timedelta(days=i)).replace(tzinfo=UTC), include_day_of_week=True).title()
         for i in range(days + 1)
     ]
 

app/main/views/feedback.py

@@ -1,6 +1,5 @@
-from datetime import datetime
+from datetime import UTC, datetime
 
-import pytz
 from flask import current_app, redirect, render_template, request, session, url_for
 from flask_login import current_user
 from notifications_utils.bank_holidays import BankHolidays
@@ -9,6 +8,7 @@
     NotifySupportTicketComment,
     NotifyTicketType,
 )
+from notifications_utils.timezones import local_timezone
 
 from app import convert_to_boolean, current_service
 from app.extensions import zendesk_client
@@ -482,7 +482,7 @@ def thanks():
 
 
 def in_business_hours():
-    now = datetime.utcnow().replace(tzinfo=pytz.utc)
+    now = datetime.utcnow().replace(tzinfo=UTC)
 
     if is_weekend(now) or is_bank_holiday(now):
         return False
@@ -491,9 +491,7 @@ def in_business_hours():
 
 
 def london_time_today_as_utc(hour, minute):
-    return (
-        pytz.timezone("Europe/London").localize(datetime.now().replace(hour=hour, minute=minute)).astimezone(pytz.utc)
-    )
+    return datetime.now(local_timezone).replace(hour=hour, minute=minute).astimezone(UTC)
 
 
 def is_weekend(time):

app/models/job.py

@@ -1,8 +1,7 @@
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 from pathlib import Path
 from typing import Any
 
-import pytz
 from notifications_utils.letter_timings import (
     CANCELLABLE_JOB_LETTER_STATUSES,
     get_letter_timings,
@@ -153,7 +152,7 @@ def letter_printing_statement(self):
             "created",
             # We have to make the time just before 5:30pm because a
             # letter uploaded at 5:30pm will be printed the next day
-            (self.created_at - timedelta(minutes=1)).astimezone(pytz.utc).isoformat(),
+            (self.created_at - timedelta(minutes=1)).astimezone(UTC).isoformat(),
             long_form=False,
         )
 

app/utils/letters.py

@@ -1,6 +1,5 @@
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 
-import pytz
 from dateutil import parser
 from flask import url_for
 from notifications_utils.formatters import unescaped_formatted_list
@@ -16,7 +15,7 @@
 
 def printing_today_or_tomorrow(created_at):
     print_cutoff = convert_bst_to_utc(convert_utc_to_bst(datetime.utcnow()).replace(hour=17, minute=30)).replace(
-        tzinfo=pytz.utc
+        tzinfo=UTC
     )
     created_at = utc_string_to_aware_gmt_datetime(created_at)
 
@@ -28,7 +27,7 @@ def printing_today_or_tomorrow(created_at):
 
 def get_letter_printing_statement(status, created_at, long_form=True):
     if isinstance(created_at, datetime):
-        created_at = created_at.astimezone(pytz.utc).isoformat()
+        created_at = created_at.astimezone(UTC).isoformat()
     created_at_dt = parser.parse(created_at).replace(tzinfo=None)
     if letter_can_be_cancelled(status, created_at_dt):
         decription = "Printing starts" if long_form else "Printing"

app/utils/time.py

@@ -1,6 +1,5 @@
 from datetime import UTC, datetime
 
-import pytz
 from notifications_utils.timezones import utc_string_to_aware_gmt_datetime
 
 
@@ -28,4 +27,4 @@ def is_less_than_days_ago(date_from_db, number_of_days):
 
 def to_utc_string(aware_datetime):
     # Format matches app.utils.DATETIME_FORMAT in the API codebase
-    return aware_datetime.astimezone(pytz.utc).replace(tzinfo=None).strftime("%Y-%m-%dT%H:%M:%S.%fZ")
+    return aware_datetime.astimezone(UTC).replace(tzinfo=None).strftime("%Y-%m-%dT%H:%M:%S.%fZ")

requirements.in

@@ -17,7 +17,7 @@ notifications-python-client==10.0.0
 fido2==1.1.3
 
 # Run `make bump-utils` to update to the latest version
-notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@101.3.1
+notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@102.0.0
 
 govuk-frontend-jinja==3.6.0
 

requirements.txt

@@ -102,7 +102,7 @@ mistune==0.8.4
     # via notifications-utils
 notifications-python-client==10.0.0
     # via -r requirements.in
-notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@dd749865080ca7262c974c6bf0b12c3a3c739515
+notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@c8df19cdf6a9f3e68c9a979b4f44f689a8fa58a5
     # via -r requirements.in
 openpyxl==3.1.5
     # via pyexcel-xlsx
@@ -147,8 +147,6 @@ python-dateutil==2.9.0.post0
     #   notifications-utils
 python-json-logger==3.3.0
     # via notifications-utils
-pytz==2024.2
-    # via notifications-utils
 pyyaml==6.0.2
     # via notifications-utils
 redis==4.5.4

requirements_for_test.txt

@@ -163,7 +163,7 @@ moto==5.1.0
     # via -r requirements_for_test.in
 notifications-python-client==10.0.0
     # via -r requirements.txt
-notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@dd749865080ca7262c974c6bf0b12c3a3c739515
+notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@c8df19cdf6a9f3e68c9a979b4f44f689a8fa58a5
     # via -r requirements.txt
 openpyxl==3.1.5
     # via
@@ -247,10 +247,6 @@ python-json-logger==3.3.0
     # via
     #   -r requirements.txt
     #   notifications-utils
-pytz==2024.2
-    # via
-    #   -r requirements.txt
-    #   notifications-utils
 pyyaml==6.0.2
     # via
     #   -r requirements.txt

requirements_for_test_common.in

@@ -1,4 +1,4 @@
-# This file was automatically copied from notifications-utils@101.3.1
+# This file was automatically copied from notifications-utils@102.0.0
 
 beautifulsoup4==4.12.3
 pytest==8.3.4