require Python 3.12, fix some mypy, ruff and pylint errors

add ALL to ruff rules, fix some rules and ignore some

Author: ilius

.github/workflows/test-deprecated.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.11"]
+        python-version: ["3.12"]
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/test.yml

@@ -16,7 +16,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - 3.11
           - 3.12
           - 3.13
 

README.md

@@ -107,7 +107,7 @@ So you need to select the format (with UI or `--read-format` flag).
 
 ## Requirements
 
-PyGlossary requires **Python 3.11 or higher**, and works in practically all
+PyGlossary requires **Python 3.12 or higher**, and works in practically all
 mainstream operating systems, including *GNU/Linux*, *Windows*, *Mac OS*,
 *FreeBSD* and other common Unix-based operating systems.
 

pyglossary/entry.py

@@ -160,7 +160,7 @@ class Entry(BaseEntry):  # noqa: PLR0904
 	xdxfPattern = re.compile("^<k>[^<>]*</k>", re.DOTALL | re.IGNORECASE)
 	htmlPattern = re.compile(
 		".*(?:"
-		+ "|".join(
+		+ "|".join(  # noqa: FLY002
 			[
 				r"<font[ >]",
 				r"<br\s*/?\s*>",

pyglossary/entry_base.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import typing
 import warnings
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING
@@ -12,7 +11,7 @@
 
 __all__ = ["BaseEntry", "MultiStr"]
 
-MultiStr: typing.TypeAlias = "str | list[str]"
+type MultiStr = str | list[str]
 
 
 class BaseEntry(ABC):  # noqa: PLR0904

pyglossary/flags.py

@@ -1,9 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Self
-
-if TYPE_CHECKING:
-	from typing import TypeAlias
+from typing import Self
 
 __all__ = [
 	"ALWAYS",
@@ -35,4 +32,4 @@ def __new__(cls: type, name: str, desc: str) -> Self:
 NEVER = StrWithDesc("never", "Never")
 
 # to satisfy mypy:
-YesNoAlwaysNever: TypeAlias = StrWithDesc
+type YesNoAlwaysNever = StrWithDesc

pyglossary/glossary_types.py

@@ -9,8 +9,6 @@
 from typing import TYPE_CHECKING, Any, Protocol
 
 if TYPE_CHECKING:
-	from typing import TypeAlias
-
 	from .langs import Lang
 	from .sort_keys import NamedSortKey
 
@@ -23,12 +21,12 @@
 	"WriterGlossaryType",
 ]
 
-MultiStr: TypeAlias = "str | list[str]"
+type MultiStr = str | list[str]
 
 # str(rawEntry[0]): defiFormat or ""
 # rawEntry[1]: b_defi
 # rawEntry[2:]: b_term_list
-RawEntryType: TypeAlias = Sequence[bytes]
+type RawEntryType = Sequence[bytes]
 
 
 class EntryType(Protocol):  # noqa: PLR0904

pyglossary/iter_utils.py

@@ -27,7 +27,7 @@
 
 
 # from https://github.com/erikrose/more-itertools
-def unique_everseen(iterable: Iterable) -> Iterator:
+def unique_everseen[T](iterable: Iterable[T]) -> Iterator[T]:
 	"""List unique elements, preserving order. Remember all elements ever seen."""
 	from itertools import filterfalse
 

pyglossary/json_utils.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
 import json
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
-	from typing import AnyStr, TypeAlias
+	from typing import AnyStr
 
 __all__ = ["dataToPrettyJson", "jsonToData"]
 
-JsonEncodable: TypeAlias = dict | list
+type JsonEncodable = dict[Any, Any] | list[Any]
 
 
 def dataToPrettyJson(
@@ -24,5 +24,5 @@ def dataToPrettyJson(
 	)
 
 
-def jsonToData(st: AnyStr) -> JsonEncodable:
+def jsonToData[AnyStr: (bytes, str)](st: AnyStr) -> JsonEncodable:
 	return json.loads(st)

pyglossary/langs/writing_system.py

@@ -18,7 +18,7 @@
 class WritingSystem(NamedTuple):
 	name: str
 	iso: list[tuple[int, str]] | list[tuple[int, str, str]] = []
-	unicode: list = []
+	unicode: list[str] = []
 	titleTag: str = "b"
 	direction: Literal["ltr", "rtl", "ttb"] = "ltr"
 	comma: str = ", "