Loosen version restrictions

.gitignore

@@ -1,3 +1,6 @@
-/dist
-/build
+__pycache__/
 .coverage
+/build
+/dist
+poetry.lock
+

.pre-commit-config.yaml

@@ -1,20 +1,20 @@
 repos:
 
 - repo: https://github.com/pycqa/isort
-  rev: 5.9.3
+  rev: 5.13.2
   hooks:
   - id: isort
     additional_dependencies: [toml]
 - repo: https://github.com/psf/black
-  rev: 21.7b0
+  rev: 22.3.0
   hooks:
   - id: black
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.910
+  rev: v0.942
   hooks:
   - id: mypy
 - repo: https://github.com/pycqa/pylint
-  rev: v2.9.5
+  rev: v2.17.7
   hooks:
   - id: pylint
     additional_dependencies: [toml]

ass_parser/ass_event.py

@@ -168,7 +168,7 @@ def __eq__(self, other: Any) -> bool:
             key.startswith("_")
             or key == "parent"
             or getattr(self, key) == getattr(other, key)
-            for key in self.__dataclass_fields__  # type: ignore
+            for key in self.__dataclass_fields__
         )
 
 

ass_parser/ass_file.py

@@ -1,4 +1,6 @@
 """AssFile definition."""
+from __future__ import annotations
+
 from dataclasses import dataclass
 from typing import IO, Any
 

ass_parser/ass_sections/ass_base_section.py

@@ -1,4 +1,6 @@
 """AssBaseSection definition."""
+from __future__ import annotations
+
 from collections.abc import Iterable
 from typing import TypeVar
 

ass_parser/ass_sections/ass_base_tabular_section.py

@@ -1,4 +1,6 @@
 """AssBaseTabularSection definition."""
+from __future__ import annotations
+
 from collections.abc import Iterable, MutableSequence
 from typing import Generic, TypeVar
 

ass_parser/ass_sections/ass_event_list.py

@@ -1,4 +1,6 @@
 """AssEventList definition."""
+from __future__ import annotations
+
 import re
 from typing import Any, Optional
 

ass_parser/ass_sections/ass_key_value_mapping.py

@@ -1,4 +1,6 @@
 """AssKeyValueMapping definition."""
+from __future__ import annotations
+
 from collections.abc import Iterable
 from typing import Any
 
@@ -25,8 +27,8 @@ def consume_ass_body_lines(self, lines: list[tuple[int, str]]) -> None:
                 raise CorruptAssLineError(
                     line_num, line, "expected a colon"
                 ) from exc
-            else:
-                self[key] = value.lstrip()
+
+            self[key] = value.lstrip()
 
     def produce_ass_body_lines(self) -> Iterable[str]:
         """Produce ASS text representation of self, excluding the ASS header

ass_parser/ass_sections/ass_string_table.py

@@ -1,10 +1,15 @@
 """AssStringTable definition."""
+
+from __future__ import annotations
+
+from typing import Dict, Tuple
+
 from ass_parser.ass_sections.ass_base_tabular_section import (
     AssBaseTabularSection,
 )
 from ass_parser.observable_sequence_mixin import ObservableSequenceMixin
 
-AssStringTableItem = tuple[str, dict[str, str]]
+AssStringTableItem = Tuple[str, Dict[str, str]]
 
 
 class AssStringTable(

ass_parser/ass_sections/ass_style_list.py

@@ -1,4 +1,6 @@
 """AssStyleList definition."""
+from __future__ import annotations
+
 from typing import Any, Optional
 
 from ass_parser.ass_color import AssColor

ass_parser/ass_style.py

@@ -126,5 +126,5 @@ def __eq__(self, other: Any) -> bool:
             key.startswith("_")
             or key == "parent"
             or getattr(self, key) == getattr(other, key)
-            for key in self.__dataclass_fields__  # type: ignore
+            for key in self.__dataclass_fields__
         )

ass_parser/observable.py

@@ -1,4 +1,6 @@
 """Observable containers and objects."""
+from __future__ import annotations
+
 from dataclasses import dataclass, field
 from typing import Any, Callable, Generic, Optional, Type, TypeVar, cast
 

ass_parser/observable_mapping_mixin.py

@@ -1,4 +1,6 @@
 """ObservableMappingMixin definition."""
+from __future__ import annotations
+
 from collections.abc import Iterable, Iterator, Mapping, MutableMapping
 from dataclasses import dataclass
 from typing import Any, TypeVar, Union, cast, overload
@@ -23,7 +25,7 @@ class ObservableMappingMixin(MutableMapping[TKey, TValue]):
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Initialize self."""
-        super().__init__(*args, **kwargs)  # type: ignore
+        super().__init__(*args, **kwargs)
         self._data: dict[TKey, TValue] = {}
 
     def __getitem__(self, key: TKey) -> TValue:
@@ -73,7 +75,7 @@ def clear(self) -> None:
         self._data.clear()
         self.changed.emit(ObservableMappingChangeEvent())
 
-    @overload
+    @overload  # type: ignore
     def update(
         self, other: Mapping[TKey, TValue], /, **kwargs: TValue
     ) -> None:

ass_parser/observable_sequence_mixin.py

@@ -1,4 +1,6 @@
 """ObservableSequenceMixin definition."""
+from __future__ import annotations
+
 from collections.abc import Iterable, MutableSequence
 from dataclasses import dataclass
 from typing import Any, Generic, TypeVar, Union, overload
@@ -71,7 +73,7 @@ class ObservableSequenceMixin(MutableSequence[TItem]):
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Initialize self."""
-        super().__init__(*args, **kwargs)  # type: ignore
+        super().__init__(*args, **kwargs)
         self._data: list[TItem] = []
 
     def __len__(self) -> int:

ass_parser/tests/test_ass_color.py

@@ -1,4 +1,6 @@
 """Tests for the AssColor class."""
+from __future__ import annotations
+
 from typing import Union
 
 import pytest

ass_parser/tests/test_observable_object_mixin.py

@@ -1,4 +1,6 @@
 """Tests for the ObservableObjectMixin class."""
+from __future__ import annotations
+
 from dataclasses import dataclass
 from typing import Type
 from unittest.mock import Mock

ass_parser/tests/test_observable_sequence_mixin.py

@@ -56,7 +56,7 @@ def test_basic_delete() -> None:
     seq = DummySequence()
     seq.append(123)
     del seq[0]
-    assert list(seq) == []
+    assert not list(seq)
 
 
 def test_basic_delete_emits_removal_event() -> None:

ass_parser/util.py

@@ -1,4 +1,6 @@
 """Various ASS utilities."""
+from __future__ import annotations
+
 import re
 from decimal import Decimal
 from typing import Union