Ruff auto updates to 3.14

3 files changed, 30 insertions, 18 deletions

diff --git a/tests/managers/thl/test_contest/test_leaderboard.py b/tests/managers/thl/test_contest/test_leaderboard.py
index 80a88a5..1a52f83 100644
--- a/tests/managers/thl/test_contest/test_leaderboard.py
+++ b/tests/managers/thl/test_contest/test_leaderboard.py
@@ -1,10 +1,10 @@
-from datetime import datetime, timezone, timedelta
+from datetime import UTC, datetime, timedelta, timezone
 from zoneinfo import ZoneInfo
 
 from generalresearch.currency import USDCent
 from generalresearch.models.thl.contest.definitions import (
-    ContestStatus,
     ContestEndReason,
+    ContestStatus,
 )
 from generalresearch.models.thl.contest.leaderboard import (
     LeaderboardContest,
@@ -13,9 +13,11 @@ from generalresearch.models.thl.contest.leaderboard import (
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
 from test_utils.managers.contest.conftest import (
-    leaderboard_contest_in_db as contest_in_db,
     leaderboard_contest_create as contest_create,
 )
+from test_utils.managers.contest.conftest import (
+    leaderboard_contest_in_db as contest_in_db,
+)
 
 
 class TestLeaderboardContestCRUD:
@@ -39,7 +41,7 @@ class TestLeaderboardContestCRUD:
         # We have it set in the fixture as the daily contest for 2025-01-01
         assert c.end_condition.ends_at == datetime(
             2025, 1, 1, 23, 59, 59, 999999, tzinfo=ZoneInfo("America/New_York")
-        ).astimezone(tz=timezone.utc) + timedelta(minutes=90)
+        ).astimezone(tz=UTC) + timedelta(minutes=90)
 
     def test_enter(
         self,
diff --git a/tests/managers/thl/test_contest/test_milestone.py b/tests/managers/thl/test_contest/test_milestone.py
index 7312a64..66c5dc4 100644
--- a/tests/managers/thl/test_contest/test_milestone.py
+++ b/tests/managers/thl/test_contest/test_milestone.py
@@ -1,23 +1,29 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime, timezone
 
 from generalresearch.models.thl.contest.definitions import (
-    ContestStatus,
     ContestEndReason,
+    ContestStatus,
 )
 from generalresearch.models.thl.contest.milestone import (
+    ContestEntryTrigger,
     MilestoneContest,
     MilestoneContestCreate,
     MilestoneUserView,
-    ContestEntryTrigger,
 )
 from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
 from test_utils.managers.contest.conftest import (
     milestone_contest as contest,
-    milestone_contest_in_db as contest_in_db,
+)
+from test_utils.managers.contest.conftest import (
     milestone_contest_create as contest_create,
+)
+from test_utils.managers.contest.conftest import (
     milestone_contest_factory as contest_factory,
 )
+from test_utils.managers.contest.conftest import (
+    milestone_contest_in_db as contest_in_db,
+)
 
 
 class TestMilestoneContest:
@@ -28,7 +34,7 @@ class TestMilestoneContest:
         assert not should, msg
 
         # Change so that the contest ends now
-        contest.end_condition.ends_at = datetime.now(tz=timezone.utc)
+        contest.end_condition.ends_at = datetime.now(tz=UTC)
         should, msg = contest.should_end()
         assert should
         assert msg == ContestEndReason.ENDS_AT
diff --git a/tests/managers/thl/test_contest/test_raffle.py b/tests/managers/thl/test_contest/test_raffle.py
index 060055a..5804ea3 100644
--- a/tests/managers/thl/test_contest/test_raffle.py
+++ b/tests/managers/thl/test_contest/test_raffle.py
@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime, timezone
 
 import pytest
 from pydantic import ValidationError
@@ -9,21 +9,19 @@ from generalresearch.managers.thl.ledger_manager.exceptions import (
     LedgerTransactionConditionFailedError,
 )
 from generalresearch.models.thl.contest import (
-    ContestPrize,
-    ContestEntryRule,
     ContestEndCondition,
+    ContestEntryRule,
+    ContestPrize,
 )
 from generalresearch.models.thl.contest.definitions import (
-    ContestStatus,
-    ContestPrizeKind,
     ContestEndReason,
+    ContestPrizeKind,
+    ContestStatus,
 )
 from generalresearch.models.thl.contest.exceptions import ContestError
 from generalresearch.models.thl.contest.raffle import (
     ContestEntry,
     ContestEntryType,
-)
-from generalresearch.models.thl.contest.raffle import (
     RaffleContest,
     RaffleContestCreate,
     RaffleUserView,
@@ -32,10 +30,16 @@ from generalresearch.models.thl.product import Product
 from generalresearch.models.thl.user import User
 from test_utils.managers.contest.conftest import (
     raffle_contest as contest,
-    raffle_contest_in_db as contest_in_db,
+)
+from test_utils.managers.contest.conftest import (
     raffle_contest_create as contest_create,
+)
+from test_utils.managers.contest.conftest import (
     raffle_contest_factory as contest_factory,
 )
+from test_utils.managers.contest.conftest import (
+    raffle_contest_in_db as contest_in_db,
+)
 
 
 class TestRaffleContest:
@@ -46,7 +50,7 @@ class TestRaffleContest:
         assert not should, msg
 
         # Change so that the contest ends now
-        contest.end_condition.ends_at = datetime.now(tz=timezone.utc)
+        contest.end_condition.ends_at = datetime.now(tz=UTC)
         should, msg = contest.should_end()
         assert should
         assert msg == ContestEndReason.ENDS_AT