debt: Drop Python 3.6 support

- Declares minimimum supported Python version as 3.7 in all packages
- Removes compatibility code for Python <3.7
- Migrates to PEP563 style postponed evaluation of annotations
- Applies ruff upgrade fixes for Python 3.7+ (`ruff check --target-version="py37" --select=UP --fix`)

  - UP008 Use `super()` instead of `super(__class__, self)`
  - UP015 [*] Unnecessary mode argument
  - UP020 [*] Use builtin `open`
  - UP026 [*] `mock` is deprecated, use `unittest.mock`
  - UP030 Use implicit references for positional format fields
  - UP032 [*] Use f-string instead of `format` call

Author: kieran-ryan

allure-behave/setup.py

@@ -61,7 +61,8 @@ def main():
         packages=["allure_behave"],
         package_dir={"allure_behave": "src"},
         setup_requires=setup_requires,
-        install_requires=install_requires
+        install_requires=install_requires,
+        python_requires=">=3.7",
     )
 
 if __name__ == "__main__":

allure-behave/src/formatter.py

@@ -9,7 +9,7 @@
 
 class AllureFormatter(Formatter):
     def __init__(self, stream_opener, config):
-        super(AllureFormatter, self).__init__(stream_opener, config)
+        super().__init__(stream_opener, config)
 
         self.listener = AllureListener(config)
         self.file_logger = AllureFileLogger(self.stream_opener.name)

allure-nose2/setup.py

@@ -59,7 +59,8 @@ def main():
         packages=["allure_nose2"],
         package_dir={"allure_nose2": "src"},
         setup_requires=setup_requires,
-        install_requires=install_requires
+        install_requires=install_requires,
+        python_requires=">=3.7",
     )
 
 

allure-pytest-bdd/setup.py

@@ -63,7 +63,8 @@ def main():
         package_dir={"allure_pytest_bdd": "src"},
         entry_points={"pytest11": ["allure_pytest_bdd = allure_pytest_bdd.plugin"]},
         setup_requires=setup_requires,
-        install_requires=install_requires
+        install_requires=install_requires,
+        python_requires=">=3.7",
     )
 
 

allure-pytest/setup.py

@@ -76,7 +76,8 @@ def main():
         package_dir={"allure_pytest": "src"},
         entry_points={"pytest11": ["allure_pytest = allure_pytest.plugin"]},
         setup_requires=setup_requires,
-        install_requires=install_requires
+        install_requires=install_requires,
+        python_requires=">=3.7",
     )
 
 if __name__ == "__main__":

allure-python-commons-test/setup.py

@@ -50,7 +50,8 @@ def main():
         long_description_content_type="text/markdown",
         packages=["allure_commons_test"],
         package_dir={"allure_commons_test": "src"},
-        install_requires=install_requires
+        install_requires=install_requires,
+        python_requires=">=3.7",
     )
 
 if __name__ == "__main__":

allure-python-commons/setup.py

@@ -56,7 +56,7 @@ def main():
         },
         package_dir={"": "src"},
         install_requires=install_requires,
-        python_requires=">=3.6"
+        python_requires=">=3.7",
     )
 
 

allure-python-commons/src/allure_commons/_allure.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from functools import wraps
-from typing import Any, Callable, TypeVar, Union, overload
+from typing import Any, Callable, TypeVar, overload
 
 from allure_commons._core import plugin_manager
 from allure_commons.types import LabelType, LinkType, ParameterMode
@@ -133,7 +135,7 @@ def link(url, link_type=LinkType.LINK, name=None):
         plugin_manager.hook.add_link(url=url, link_type=link_type, name=name)
 
     @staticmethod
-    def parameter(name, value, excluded=None, mode: Union[ParameterMode, None] = None):
+    def parameter(name, value, excluded=None, mode: ParameterMode | None = None):
         plugin_manager.hook.add_parameter(name=name, value=value, excluded=excluded, mode=mode)
 
     @staticmethod
@@ -162,7 +164,7 @@ def manual():
 
 
 @overload
-def step(title: str) -> "StepContext":
+def step(title: str) -> StepContext:
     ...
 
 

allure-python-commons/src/allure_commons/logger.py

@@ -1,4 +1,3 @@
-import io
 import os
 from pathlib import Path
 import json
@@ -22,7 +21,7 @@ def _report_item(self, item):
         indent = INDENT if os.environ.get("ALLURE_INDENT_OUTPUT") else None
         filename = item.file_pattern.format(prefix=uuid.uuid4())
         data = asdict(item, filter=lambda _, v: v or v is False)
-        with io.open(self._report_dir / filename, "w", encoding="utf8") as json_file:
+        with open(self._report_dir / filename, "w", encoding="utf8") as json_file:
             json.dump(data, json_file, indent=indent, ensure_ascii=False)
 
     @hookimpl

allure-python-commons/src/allure_commons/utils.py

@@ -1,6 +1,5 @@
 import os
 import string
-import sys
 import time
 import uuid
 import json
@@ -41,7 +40,7 @@ def platform_label():
 
 
 def thread_tag():
-    return "{0}-{1}".format(os.getpid(), threading.current_thread().name)
+    return f"{os.getpid()}-{threading.current_thread().name}"
 
 
 def host_tag():
@@ -245,13 +244,7 @@ def func_parameters(func, *args, **kwargs):
         args_dict.pop(arg_spec.args[0], None)
 
     if kwargs:
-        if sys.version_info < (3, 7):
-            # Sort alphabetically as old python versions does
-            # not preserve call order for kwargs.
-            arg_order.extend(sorted(list(kwargs.keys())))
-        else:
-            # Keep py3.7 behaviour to preserve kwargs order
-            arg_order.extend(list(kwargs.keys()))
+        arg_order.extend(list(kwargs.keys()))
         parameters.update(kwargs)
 
     parameters.update(args_dict)
@@ -328,7 +321,11 @@ def get_testplan():
     file_path = os.environ.get("ALLURE_TESTPLAN_PATH")
 
     if file_path and os.path.exists(file_path):
+<<<<<<< HEAD
         with open(file_path, "r") as plan_file:
+=======
+        with open(file_path) as plan_file:
+>>>>>>> 158bf87 (debt: Drop Python 3.6 support)
             plan = json.load(plan_file)
             planned_tests = plan.get("tests", [])