Merge branch 'master' into dev-greg

3 files changed, 11 insertions, 9 deletions

diff --git a/tests/models/custom_types/test_aware_datetime.py b/tests/models/custom_types/test_aware_datetime.py
index 530142e..e8a5aa3 100644
--- a/tests/models/custom_types/test_aware_datetime.py
+++ b/tests/models/custom_types/test_aware_datetime.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 import pytest
 import pytz
@@ -27,14 +27,14 @@ class TestAwareDatetimeISO:
         AwareDatetimeISOModel.model_validate_json(t.model_dump_json())
 
     def test_dt(self):
-        dt = datetime(2023, 10, 10, 1, 1, 1, tzinfo=timezone.utc)
+        dt = datetime(2023, 10, 10, 1, 1, 1, tzinfo=UTC)
         t = AwareDatetimeISOModel(dt=dt, dt_optional=dt)
         AwareDatetimeISOModel.model_validate_json(t.model_dump_json())
 
         t = AwareDatetimeISOModel(dt=dt, dt_optional=None)
         AwareDatetimeISOModel.model_validate_json(t.model_dump_json())
 
-        dt = datetime(2023, 10, 10, 1, 1, 1, microsecond=123, tzinfo=timezone.utc)
+        dt = datetime(2023, 10, 10, 1, 1, 1, microsecond=123, tzinfo=UTC)
         t = AwareDatetimeISOModel(dt=dt, dt_optional=dt)
         AwareDatetimeISOModel.model_validate_json(t.model_dump_json())
 
@@ -42,7 +42,7 @@ class TestAwareDatetimeISO:
         AwareDatetimeISOModel.model_validate_json(t.model_dump_json())
 
     def test_no_tz(self):
-        dt = datetime(2023, 10, 10, 1, 1, 1)
+        dt = datetime(2023, 10, 10, 1, 1, 1)  # noqa
 
         with pytest.raises(expected_exception=ValidationError):
             AwareDatetimeISOModel(dt=dt, dt_optional=None)
diff --git a/tests/models/custom_types/test_dsn.py b/tests/models/custom_types/test_dsn.py
index 16e1f83..eff02d3 100644
--- a/tests/models/custom_types/test_dsn.py
+++ b/tests/models/custom_types/test_dsn.py
@@ -1,4 +1,5 @@
-from typing import Optional
+from __future__ import annotations
+
 from uuid import uuid4
 
 import pytest
@@ -11,16 +12,15 @@ from generalresearch.models.custom_types import DaskDsn, SentryDsn
 
 
 class SettingsModel(BaseModel):
-    dask: Optional["DaskDsn"] = Field(default=None)
-    sentry: Optional["SentryDsn"] = Field(default=None)
-    db: Optional["MySQLDsn"] = Field(default=None)
+    dask: DaskDsn | None = Field(default=None)
+    sentry: SentryDsn | None = Field(default=None)
+    db: MySQLDsn | None = Field(default=None)
 
 
 # --- Pytest themselves ---
 
 
 class TestDaskDsn:
-
     def test_base(self):
         from dask.distributed import Client
 
diff --git a/tests/models/custom_types/test_therest.py b/tests/models/custom_types/test_therest.py
index 13e9bae..01bc644 100644
--- a/tests/models/custom_types/test_therest.py
+++ b/tests/models/custom_types/test_therest.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from uuid import UUID