chore: build fixes

Author: aaltat

.gitignore

@@ -16,5 +16,7 @@ dist
 build
 tmp
 
+src/robotframework_assertion_engine.egg-info
+
 .ruff_cache
 .pytest_cache

pyproject.toml

@@ -5,28 +5,27 @@ description = "Generic way to create meaningful and easy to use assertions for t
 authors = [{ name="Tatu Aalto", email="aalto.tatu@gmail.com" }]
 license = "Apache-2.0"
 readme = "README.md"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+]
 keywords = ["Robot Framework", "Libraries", "Assertions"]
-
-requires-python = ">=3.10,<4.0"
+requires-python = ">=3.10"
 dependencies = ["robotframework >= 6.1.1", "robotframework-pythonlibcore>=3.0.0"]
 
 [project.urls]
 Homepage = "https://github.com/MarketSquare/AssertionEngine"
 Issues = "https://github.com/MarketSquare/AssertionEngine/issues"
 Changelog = "https://github.com/MarketSquare/AssertionEngine/releases"
 
-[tool.setuptools]
-packages = ["assertionengine"]
-
 [tool.ruff]
-lint.unfixable = []
 exclude = [
   "__pycache__",
 ]
 lint.ignore = [
   "E501",  # line too long
 ]
-target-version = "py38"
+target-version = "py310"
 lint.select = [
   "E",
   "F",

assertionengine/__init__.py src/assertionengine/__init__.pyassertionengine/__init__.py renamed to src/assertionengine/__init__.py

@@ -14,8 +14,9 @@
 
 import ast
 import re
+from collections.abc import Callable
 from enum import Enum, Flag, IntFlag
-from typing import Any, Callable, Dict, List, Optional, Tuple, TypeVar, Union, cast
+from typing import Any, TypeVar, cast
 
 from robot.libraries.BuiltIn import BuiltIn
 
@@ -107,7 +108,7 @@
     AssertionOperator["then"],
 ]
 
-handlers: Dict[AssertionOperator, Tuple[Callable, str]] = {
+handlers: dict[AssertionOperator, tuple[Callable, str]] = {
     AssertionOperator["=="]: (lambda a, b: a == b, "should be"),
     AssertionOperator["!="]: (lambda a, b: a != b, "should not be"),
     AssertionOperator["<"]: (lambda a, b: a < b, "should be less than"),
@@ -132,7 +133,7 @@
 }
 
 
-set_handlers: Dict[AssertionOperator, Tuple[Callable, str]] = {
+set_handlers: dict[AssertionOperator, tuple[Callable, str]] = {
     AssertionOperator["=="]: (lambda a, b: a == b, "should be"),
     AssertionOperator["!="]: (lambda a, b: a != b, "should not be"),
     AssertionOperator["*="]: (lambda a, b: b.issubset(a), "should contain"),
@@ -145,15 +146,15 @@
 T = TypeVar("T")
 
 
-def apply_formatters(value: T, formatters: Optional[List[Any]]) -> Any:
+def apply_formatters(value: T, formatters: list[Any] | None) -> Any:
     if not formatters:
         return value
     for formatter in formatters:
         value = formatter(value)
     return value
 
 
-def apply_to_expected(expected: Any, formatters: Optional[List[Any]]) -> Any:
+def apply_to_expected(expected: Any, formatters: list[Any] | None) -> Any:
     if not formatters:
         return expected
     for formatter in formatters:
@@ -164,11 +165,11 @@ def apply_to_expected(expected: Any, formatters: Optional[List[Any]]) -> Any:
 
 def verify_assertion(
     value: T,
-    operator: Optional[AssertionOperator],
+    operator: AssertionOperator | None,
     expected: Any,
     message: str = "",
-    custom_message: Optional[str] = None,
-    formatters: Optional[list] = None,
+    custom_message: str | None = None,
+    formatters: list | None = None,
 ) -> Any:
     if operator is None and expected:
         raise ValueError(
@@ -193,11 +194,11 @@ def verify_assertion(
 
 
 def flag_verify_assertion(
-    value: Union[IntFlag, Flag],
-    operator: Optional[AssertionOperator],
+    value: IntFlag | Flag,
+    operator: AssertionOperator | None,
     expected: Any,
     message: str = "",
-    custom_message: Optional[str] = None,
+    custom_message: str | None = None,
 ) -> Any:
     if not isinstance(value, Flag):
         raise TypeError(f"Verified value was not of type Flag. It was {type(value)}")
@@ -273,7 +274,7 @@ def raise_error(custom_message, expected, filler, message, text, value):
 
 def float_str_verify_assertion(
     value: T,
-    operator: Optional[AssertionOperator],
+    operator: AssertionOperator | None,
     expected: Any,
     message="",
     custom_message="",
@@ -294,7 +295,7 @@ def float_str_verify_assertion(
 
 def int_str_verify_assertion(
     value: T,
-    operator: Optional[AssertionOperator],
+    operator: AssertionOperator | None,
     expected: Any,
     message="",
     custom_message="",
@@ -315,7 +316,7 @@ def int_str_verify_assertion(
 
 def bool_verify_assertion(
     value: T,
-    operator: Optional[AssertionOperator],
+    operator: AssertionOperator | None,
     expected: Any,
     message="",
     custom_message="",
@@ -330,7 +331,7 @@ def bool_verify_assertion(
     return verify_assertion(value, operator, expected_bool, message, custom_message)
 
 
-def map_list(selected: List):
+def map_list(selected: list):
     if not selected or len(selected) == 0:
         return None
     if len(selected) == 1:
@@ -339,9 +340,9 @@ def map_list(selected: List):
 
 
 def list_verify_assertion(
-    value: List,
-    operator: Optional[AssertionOperator],
-    expected: List,
+    value: list,
+    operator: AssertionOperator | None,
+    expected: list,
     message="",
     custom_message="",
 ):
@@ -382,9 +383,9 @@ def list_verify_assertion(
 
 
 def dict_verify_assertion(
-    value: Dict,
-    operator: Optional[AssertionOperator],
-    expected: Optional[Dict],
+    value: dict,
+    operator: AssertionOperator | None,
+    expected: dict | None,
     message="",
     custom_message="",
 ):
@@ -397,9 +398,9 @@ def dict_verify_assertion(
 
 
 def int_dict_verify_assertion(
-    value: Dict[str, int],
-    operator: Optional[AssertionOperator],
-    expected: Optional[Dict[str, int]],
+    value: dict[str, int],
+    operator: AssertionOperator | None,
+    expected: dict[str, int] | None,
     message="",
     custom_message="",
 ):

assertionengine/assertion_engine.py src/assertionengine/assertion_engine.pyassertionengine/assertion_engine.py renamed to src/assertionengine/assertion_engine.py

@@ -1,6 +1,5 @@
 import re
 from abc import ABC, abstractmethod
-from typing import List
 
 
 def _strip(value: str) -> str:
@@ -37,5 +36,5 @@ def set_formatter(self, keyword, formatter): ...
     def normalize_keyword(self, name: str):
         return name.lower().replace(" ", "_")
 
-    def formatters_to_method(self, kw_formatter: List) -> List:
+    def formatters_to_method(self, kw_formatter: list) -> list:
         return [FormatRules[formatter.lower()] for formatter in kw_formatter]

assertionengine/assertion_formatter.py …c/assertionengine/assertion_formatter.pyassertionengine/assertion_formatter.py renamed to src/assertionengine/assertion_formatter.py assertionengine/assertion_formatter.py renamed to src/assertionengine/assertion_formatter.py

@@ -89,8 +89,8 @@ def lint_robot(ctx):
 @task(lint_robot)
 def lint(ctx, error=False):
     """Lint Robot Framework test data and Python code."""
-    ruff_format_command = ["ruff", "format", "assertionengine", "utest", "tasks.py"]
-    ruff_check_command = ["ruff", "check", "assertionengine"]
+    ruff_format_command = ["ruff", "format", "src/assertionengine", "utest", "tasks.py"]
+    ruff_check_command = ["ruff", "check", "src/assertionengine"]
     if error:
         ruff_format_command.insert(2, "--check")
     else:
@@ -101,7 +101,7 @@ def lint(ctx, error=False):
     print(f"Run Ruff: {ruff_check_command}")
     ctx.run(" ".join(ruff_check_command))
     print("Run mypy")
-    ctx.run("mypy --config-file ./pyproject.toml assertionengine/")
+    ctx.run("mypy --config-file ./pyproject.toml src/assertionengine/")
 
 
 @task