Upgrade to Python 3.11

.github/workflows/unit-tests.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     uses: bryanforbes/python-workflows/.github/workflows/reusable-unit-tests.yml@master
     with:
-      python_versions: '["3.10"]'
+      python_versions: '["3.11"]'
       coverage: true
       pytest_args: '--block-network --record-mode=none -p no:sugar'
     secrets:

alembic/versions/ffc7403e056d_switch_to_timestamp_with_tz_for_next_.py

@@ -48,7 +48,7 @@ def upgrade():
         op.execute(
             daily_breads_after.update()
             .filter_by(guild_id=row[0])
-            .values({'next_scheduled': row[1].replace(tzinfo=datetime.timezone.utc)})
+            .values({'next_scheduled': row[1].replace(tzinfo=datetime.UTC)})
         )
 
 

erasmus/cogs/admin.py

@@ -4,8 +4,8 @@
 import textwrap
 import traceback
 from contextlib import asynccontextmanager, redirect_stdout
-from typing import TYPE_CHECKING, Any, Final
-from typing_extensions import Self, override
+from typing import TYPE_CHECKING, Any, Final, Self
+from typing_extensions import override
 
 import discord
 from botus_receptus import GroupCog, utils

erasmus/cogs/bible/bible_lookup.py

@@ -1,15 +1,13 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Self
 
 from attrs import frozen
 from discord import app_commands
 
 from ...utils import AutoCompleter
 
 if TYPE_CHECKING:
-    from typing_extensions import Self
-
     from ...types import Bible
 
 

erasmus/cogs/bible/daily_bread/daily_bread_preferences_group.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 from itertools import chain
-from typing import TYPE_CHECKING, ClassVar, Final, cast
-from typing_extensions import Self, Unpack, override
+from typing import TYPE_CHECKING, ClassVar, Final, Self, Unpack, cast
+from typing_extensions import override
 
 import discord
 import pendulum

erasmus/cogs/confession.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 from itertools import pairwise
-from typing import TYPE_CHECKING, Final, NamedTuple, cast
-from typing_extensions import Self, override
+from typing import TYPE_CHECKING, Final, NamedTuple, Self, cast
+from typing_extensions import override
 
 import discord
 from attrs import frozen

erasmus/config.py

@@ -1,12 +1,9 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, TypedDict
+from typing import NotRequired, TypedDict
 
 from botus_receptus import Config as BaseConfig
 
-if TYPE_CHECKING:
-    from typing_extensions import NotRequired
-
 
 class ServiceConfig(TypedDict):
     api_key: NotRequired[str]

erasmus/data.py

@@ -2,8 +2,8 @@
 
 from enum import Flag, auto
 from pathlib import Path
-from typing import TYPE_CHECKING, Final, TypedDict
-from typing_extensions import Self, override
+from typing import TYPE_CHECKING, Final, Self, TypedDict
+from typing_extensions import override
 
 import orjson
 from attrs import evolve, frozen

erasmus/db/types.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-from typing_extensions import Self, override
+from typing import TYPE_CHECKING, Self
+from typing_extensions import override
 
 import pendulum
 from pendulum.tz.timezone import Timezone as _Timezone

erasmus/l10n/__init__.py

@@ -2,7 +2,7 @@
 
 from contextlib import contextmanager
 from pathlib import Path
-from typing import TYPE_CHECKING, Literal, TypedDict, overload
+from typing import TYPE_CHECKING, Literal, NotRequired, TypedDict, Unpack, overload
 
 from attrs import define, field, frozen
 from discord import app_commands
@@ -14,7 +14,6 @@
 if TYPE_CHECKING:
     from _typeshed import SupportsItems
     from collections.abc import Iterator
-    from typing_extensions import NotRequired, Unpack
 
     import discord
 

erasmus/l10n/fluent.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 from datetime import timedelta
-from typing import TYPE_CHECKING, ClassVar, Literal, get_args
-from typing_extensions import Self, override
+from typing import TYPE_CHECKING, ClassVar, Literal, Self, get_args
+from typing_extensions import override
 
 from attrs import define, field, validators
 from babel.dates import format_timedelta

erasmus/page_source.py

@@ -4,13 +4,14 @@
 from abc import abstractmethod
 from collections.abc import AsyncIterable, Awaitable, Callable, Iterable, Sequence
 from typing import (
+    NotRequired,
     ParamSpec,
     Protocol,
     TypeAlias,
     TypedDict,
     runtime_checkable,
 )
-from typing_extensions import NotRequired, TypeVar, override
+from typing_extensions import TypeVar, override
 
 import discord
 

erasmus/services/apibible.py

@@ -2,8 +2,8 @@
 
 import asyncio
 import contextlib
-from typing import TYPE_CHECKING, Final, Literal, TypedDict
-from typing_extensions import Self, override
+from typing import TYPE_CHECKING, Final, Literal, Self, TypedDict
+from typing_extensions import override
 
 import orjson
 from attrs import field, frozen

erasmus/services/base_service.py

@@ -2,14 +2,12 @@
 
 import logging
 from abc import abstractmethod
-from typing import TYPE_CHECKING, Final
+from typing import TYPE_CHECKING, Final, Self
 
 from attrs import frozen
 from botus_receptus import re
 
 if TYPE_CHECKING:
-    from typing_extensions import Self
-
     import aiohttp
 
     from ..config import ServiceConfig

erasmus/ui_pages.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import contextlib
-from typing import TYPE_CHECKING, Final, Generic, cast
-from typing_extensions import Self, TypeVar, override
+from typing import TYPE_CHECKING, Final, Generic, Self, cast
+from typing_extensions import TypeVar, override
 
 import discord
 from botus_receptus import utils

erasmus/utils.py

@@ -1,8 +1,17 @@
 from __future__ import annotations
 
 from collections import OrderedDict
-from typing import TYPE_CHECKING, Final, Generic, Protocol, TypedDict, overload
-from typing_extensions import NotRequired, TypeVar, Unpack, override
+from typing import (
+    TYPE_CHECKING,
+    Final,
+    Generic,
+    NotRequired,
+    Protocol,
+    TypedDict,
+    Unpack,
+    overload,
+)
+from typing_extensions import TypeVar, override
 
 from attrs import field, frozen
 from botus_receptus import utils

pyproject.toml

@@ -9,7 +9,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.11"
 alembic = "1.11.3"
 attrs = "23.1.0"
 beautifulsoup4 = "4.12.2"
@@ -46,7 +46,7 @@ erasmus = 'erasmus.run:main'
 
 [tool.black]
 line-length = 88
-target-version = ["py310"]
+target-version = ["py311"]
 skip-string-normalization = true
 include = '\.pyi?$'
 exclude = '''
@@ -82,7 +82,7 @@ select = [
 ignore = ["ANN101", "ANN102", "PLR0913", "PLR2004", "PT004", "TRY003"]
 extend-exclude = [".venv*"]
 line-length = 88
-target-version = "py310"
+target-version = "py311"
 
 [tool.ruff.per-file-ignores]
 "*.pyi" = ["ANN401", "E501", "E701", "E741", "F401", "F403", "F405", "F811", "FBT001", "FBT002", "PGH003"]
@@ -118,7 +118,7 @@ stubPath = "./stubs"
 venvPath = "."
 venv = ".venv"
 
-pythonVersion = "3.10"
+pythonVersion = "3.11"
 reportUnnecessaryTypeIgnoreComment = "warning"
 typeCheckingMode = "strict"
 reportPrivateUsage = "none"

stubs/bs4/element.pyi

@@ -8,11 +8,12 @@ from typing import (
     Literal,
     NewType,
     Protocol,
+    Self,
     TypeAlias,
     overload,
     type_check_only,
 )
-from typing_extensions import Self, TypeVar
+from typing_extensions import TypeVar
 
 from . import BeautifulSoup
 from .builder import TreeBuilder

stubs/pendulum/date.pyi

@@ -1,6 +1,5 @@
 from datetime import date, timedelta
-from typing import Literal, SupportsIndex, overload
-from typing_extensions import Self
+from typing import Literal, Self, SupportsIndex, overload
 
 from .datetime import DateTime
 from .mixins.default import FormattableMixin

stubs/pendulum/datetime.pyi

@@ -1,6 +1,5 @@
 from datetime import date, datetime, time, timedelta, tzinfo
-from typing import ClassVar, Literal, SupportsIndex
-from typing_extensions import Self
+from typing import ClassVar, Literal, Self, SupportsIndex
 
 from .date import Date
 from .period import Period

stubs/pendulum/duration.pyi

@@ -1,6 +1,5 @@
 from datetime import timedelta
-from typing import overload
-from typing_extensions import Self
+from typing import Self, overload
 
 class Duration(timedelta):
     def __new__(

stubs/pendulum/period.pyi

@@ -1,7 +1,6 @@
 from collections.abc import Iterator
 from datetime import date, timedelta
-from typing import overload
-from typing_extensions import Self
+from typing import Self, overload
 
 from .duration import Duration
 

stubs/pendulum/time.pyi

@@ -1,6 +1,5 @@
 from datetime import time, timedelta, tzinfo
-from typing import Literal, overload
-from typing_extensions import Self
+from typing import Literal, Self, overload
 
 from .duration import AbsoluteDuration, Duration
 from .mixins.default import FormattableMixin

tests/db/test_types.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from datetime import datetime, time, timezone
+from datetime import UTC, datetime, time
 
 import pendulum
 import pytest
@@ -67,7 +67,7 @@ def test_process_bind_param(
         [
             (
                 True,
-                datetime(2020, 6, 26, 5, tzinfo=timezone.utc),
+                datetime(2020, 6, 26, 5, tzinfo=UTC),
                 pendulum.datetime(2020, 6, 26, 5, tz=pendulum.UTC),
             ),
             (
@@ -144,7 +144,7 @@ def test_process_bind_param(
         'result_value,expected',
         [
             (
-                time(5, 30, 1, 2, tzinfo=timezone.utc),
+                time(5, 30, 1, 2, tzinfo=UTC),
                 pendulum.Time(5, 30, 1, 2, tzinfo=None),
             ),
             (None, None),