Use pyupgrade instead of removed option

- adapt code accordingly

Author: mrbean-bremen

.pre-commit-config.yaml

@@ -24,11 +24,15 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
-      - id: fix-encoding-pragma
-        args: [ --remove ]
       - id: check-yaml
       - id: debug-statements
         language_version: python3
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.20.0
+    hooks:
+      - id: pyupgrade
+        args:
+          - --py39-plus
   - repo: https://github.com/PyCQA/autoflake
     rev: v2.3.1
     hooks:

docs/source/conf.py

@@ -1,5 +1,3 @@
-from typing import List, Dict
-
 # pytest-order documentation build configuration file, created by
 # sphinx-quickstart on Mon Mar 17 18:20:44 2014.
 #
@@ -75,7 +73,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns: List[str] = []
+exclude_patterns: list[str] = []
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -135,7 +133,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path: List[str] = []
+html_static_path: list[str] = []
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -188,7 +186,7 @@
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements: Dict[str, str] = {
+latex_elements: dict[str, str] = {
     # The paper size ("letterpaper" or "a4paper").
     # "papersize": "letterpaper",
     # The font size ("10pt", "11pt" or "12pt").

src/pytest_order/item.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Optional, List, Dict, Tuple, Generic, TypeVar
+from typing import Optional, Generic, TypeVar
 
 from _pytest.python import Function
 
@@ -46,20 +46,20 @@ class ItemList:
 
     def __init__(
         self,
-        items: List[Item],
+        items: list[Item],
         settings: Settings,
         scope: Scope,
-        rel_marks: List["RelativeMark[Item]"],
-        dep_marks: List["RelativeMark[Item]"],
+        rel_marks: list["RelativeMark[Item]"],
+        dep_marks: list["RelativeMark[Item]"],
     ) -> None:
         self.items = items
         self.settings = settings
         self.scope = scope
-        self.start_items: List[Tuple[int, List[Item]]] = []
-        self.end_items: List[Tuple[int, List[Item]]] = []
-        self.unordered_items: List[Item] = []
-        self._start_items: Dict[int, List[Item]] = {}
-        self._end_items: Dict[int, List[Item]] = {}
+        self.start_items: list[tuple[int, list[Item]]] = []
+        self.end_items: list[tuple[int, list[Item]]] = []
+        self.unordered_items: list[Item] = []
+        self._start_items: dict[int, list[Item]] = {}
+        self._end_items: dict[int, list[Item]] = {}
         self.all_rel_marks = rel_marks
         self.all_dep_marks = dep_marks
         self.rel_marks = filter_marks(rel_marks, items)
@@ -77,7 +77,7 @@ def handle_order_mark(self, item: Item) -> None:
             else:
                 self._start_items.setdefault(item.order, []).append(item)
 
-    def sort_numbered_items(self) -> List[Item]:
+    def sort_numbered_items(self) -> list[Item]:
         self.start_items = sorted(self._start_items.items())
         self.end_items = sorted(self._end_items.items())
         sorted_list = []
@@ -120,17 +120,17 @@ def print_unhandled_items(self) -> None:
     def number_of_rel_groups(self) -> int:
         return len(self.rel_marks) + len(self.dep_marks)
 
-    def handle_rel_marks(self, sorted_list: List[Item]) -> None:
+    def handle_rel_marks(self, sorted_list: list[Item]) -> None:
         self.handle_relative_marks(self.rel_marks, sorted_list, self.all_rel_marks)
 
-    def handle_dep_marks(self, sorted_list: List[Item]) -> None:
+    def handle_dep_marks(self, sorted_list: list[Item]) -> None:
         self.handle_relative_marks(self.dep_marks, sorted_list, self.all_dep_marks)
 
     @staticmethod
     def handle_relative_marks(
-        marks: List["RelativeMark[Item]"],
-        sorted_list: List[Item],
-        all_marks: List["RelativeMark[Item]"],
+        marks: list["RelativeMark[Item]"],
+        sorted_list: list[Item],
+        all_marks: list["RelativeMark[Item]"],
     ) -> None:
         for mark in reversed(marks):
             if move_item(mark, sorted_list):
@@ -152,9 +152,9 @@ class ItemGroup:
     """
 
     def __init__(
-        self, items: Optional[List[Item]] = None, order: Optional[int] = None
+        self, items: Optional[list[Item]] = None, order: Optional[int] = None
     ) -> None:
-        self.items: List[Item] = items or []
+        self.items: list[Item] = items or []
         self.order = order
         self.nr_rel_items = 0
 
@@ -166,7 +166,7 @@ def dec_rel_marks(self) -> None:
         if self.order is None:
             self.nr_rel_items -= 1
 
-    def extend(self, groups: List["ItemGroup"], order: Optional[int]) -> None:
+    def extend(self, groups: list["ItemGroup"], order: Optional[int]) -> None:
         for group in groups:
             self.items.extend(group.items)
         self.order = order
@@ -190,8 +190,8 @@ def __init__(
 
 
 def filter_marks(
-    marks: List[RelativeMark[_ItemType]], all_items: List[Item]
-) -> List[RelativeMark[_ItemType]]:
+    marks: list[RelativeMark[_ItemType]], all_items: list[Item]
+) -> list[RelativeMark[_ItemType]]:
     result = []
     for mark in marks:
         if mark.item in all_items and mark.item_to_move in all_items:
@@ -201,7 +201,7 @@ def filter_marks(
     return result
 
 
-def move_item(mark: RelativeMark[_ItemType], sorted_items: List[_ItemType]) -> bool:
+def move_item(mark: RelativeMark[_ItemType], sorted_items: list[_ItemType]) -> bool:
     if (
         mark.item not in sorted_items
         or mark.item_to_move not in sorted_items

src/pytest_order/plugin.py

@@ -1,5 +1,3 @@
-from typing import List
-
 import pytest
 from _pytest.config import Config
 from _pytest.config.argparsing import Parser
@@ -167,6 +165,6 @@ class OrderingPlugin:
     """
 
 
-def modify_items(session: Session, config: Config, items: List[Function]) -> None:
+def modify_items(session: Session, config: Config, items: list[Function]) -> None:
     sorter = Sorter(config, items)
     items[:] = sorter.sort_items()