Merge pull request #65 from ikalnytskyi/chore/ruff-rules

More Ruff lint rules
ikalnytskyi · Nov 18, 2023 · 00972d0 · 00972d0
2 parents 0f30d1c + eaedeaf
commit 00972d0
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 62 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,9 +8,7 @@ description = "Dependency injection framework designed with Python in mind."
 readme = "README.rst"
 requires-python = ">=3.8"
 license = "MIT"
-authors = [
-  { name = "Ihor Kalnytskyi", email = "[email protected]" },
-]
+authors = [{ name = "Ihor Kalnytskyi", email = "[email protected]" }]
 classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: MIT License",
@@ -38,7 +36,7 @@ source = "vcs"
 
 [tool.hatch.envs.test]
 dependencies = ["pytest", "flask"]
-scripts.run = "python -m pytest --strict {args:-vv}"
+scripts.run = "python -m pytest --strict-markers {args:-vv}"
 
 [tool.hatch.envs.lint]
 detached = true
@@ -50,11 +48,36 @@ dependencies = ["sphinx", "sphinx_rtd_theme"]
 scripts.run = "sphinx-build -W -b html docs docs/_build/"
 
 [tool.ruff]
-select = ["F", "E", "W", "I", "S", "FBT", "B", "C4", "DTZ", "T10", "ISC", "RET", "SLF", "RUF"]
-ignore = ["S101", "B904", "ISC001"]
+select = [
+  "F",
+  "E",
+  "W",
+  "I",
+  "D",
+  "UP",
+  "S",
+  "FBT",
+  "B",
+  "C4",
+  "DTZ",
+  "T10",
+  "ISC",
+  "PIE",
+  "T20",
+  "PYI",
+  "PT",
+  "RET",
+  "SLF",
+  "SIM",
+  "TCH",
+  "ERA",
+  "RUF",
+]
+ignore = ["D203", "D213", "D401", "S101", "B904", "ISC001", "PT011", "SIM117"]
 
 [tool.ruff.isort]
 known-first-party = ["picobox"]
 
 [tool.ruff.per-file-ignores]
-"examples/*" = ["I"]
+"examples/*" = ["I", "D", "T20"]
+"tests/*" = ["D"]
diff --git a/src/picobox/_box.py b/src/picobox/_box.py
@@ -157,7 +157,7 @@ def get(self, key: t.Hashable, default: t.Any = _unset) -> t.Any:
 
         return value
 
-    def pass_(self, key: t.Hashable, *, as_: t.Text = _unset):
+    def pass_(self, key: t.Hashable, *, as_: str = _unset):
         r"""Pass a dependency to a function if nothing explicitly passed.
 
         The decorator implements late binding which means it does not require

diff --git a/src/picobox/_stack.py b/src/picobox/_stack.py
@@ -93,7 +93,7 @@ def do(magic):
     .. versionadded:: 2.2
     """
 
-    def __init__(self, name: t.Optional[t.Text] = None):
+    def __init__(self, name: t.Optional[str] = None):
         self._name = name
         self._stack = []
         self._lock = threading.Lock()

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -6,7 +6,6 @@
 
 
 @pytest.fixture(
-    scope="function",
     params=[
         42,
         "42",
@@ -22,7 +21,6 @@ def hashable_value(request):
 
 
 @pytest.fixture(
-    scope="function",
     params=[
         42,
         "42",
@@ -41,16 +39,16 @@ def any_value(request):
     return request.param
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def supported_key(hashable_value):
     return hashable_value
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def supported_value(any_value):
     return any_value
 
 
 @pytest.fixture(params=[picobox.Box, picobox.ChainBox])
 def boxclass(request):
-    yield request.param
+    return request.param
diff --git a/tests/contrib/test_flaskscopes.py b/tests/contrib/test_flaskscopes.py
@@ -6,33 +6,33 @@
 from picobox.contrib import flaskscopes
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def appscope():
     return flaskscopes.application()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def reqscope():
     return flaskscopes.request()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def flaskapp():
     return flask.Flask("test")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def appcontext(flaskapp):
     return flaskapp.app_context
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def reqcontext(flaskapp):
     return flaskapp.test_request_context
 
 
 @pytest.mark.parametrize(
-    "scopename, ctx",
+    ("scopename", "ctx"),
     [
         ("appscope", "appcontext"),
         ("reqscope", "reqcontext"),
@@ -63,7 +63,7 @@ def test_scope_set_nocontext(request, scopename):
 
 
 @pytest.mark.parametrize(
-    "scopename, ctx",
+    ("scopename", "ctx"),
     [
         ("appscope", "appcontext"),
         ("reqscope", "reqcontext"),
@@ -83,7 +83,7 @@ def test_scope_set_value_overwrite(request, scopename, ctx):
 
 
 @pytest.mark.parametrize(
-    "scopename, ctx",
+    ("scopename", "ctx"),
     [
         ("appscope", "appcontext"),
         ("reqscope", "reqcontext"),
@@ -99,7 +99,7 @@ def test_scope_get_keyerror(request, scopename, ctx, supported_key):
 
 
 @pytest.mark.parametrize(
-    "scopename, ctx",
+    ("scopename", "ctx"),
     [
         ("appscope", "appcontext"),
         ("reqscope", "reqcontext"),
@@ -129,7 +129,7 @@ def test_scope_state_not_leaked(request, scopename, ctx):
 
 
 @pytest.mark.parametrize(
-    "scopename, ctx",
+    ("scopename", "ctx"),
     [
         ("appscope", "appcontext"),
     ],
@@ -147,7 +147,7 @@ def test_scope_value_shared(request, scopename, ctx):
 
 
 @pytest.mark.parametrize(
-    "scopename, ctx",
+    ("scopename", "ctx"),
     [
         ("reqscope", "reqcontext"),
     ],

diff --git a/tests/test_box.py b/tests/test_box.py
@@ -127,7 +127,7 @@ def test_box_get_default(boxclass):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -148,7 +148,7 @@ def fn(a, b, c):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -170,7 +170,7 @@ def fn(a, b, c):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -193,7 +193,7 @@ def fn(a, b, c):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -216,7 +216,7 @@ def fn(a, b, c=20):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -242,7 +242,7 @@ def fn(a, b, c):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -271,7 +271,7 @@ def fn(a, b, c):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -298,7 +298,7 @@ def fn(a, b, c):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -330,7 +330,7 @@ def fn(a, b, c):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1, 2, 3), {}, 6),
         ((1, 2), {"c": 3}, 6),
@@ -352,7 +352,7 @@ def fn(a, b, c):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((1,), {}, 1),
         ((), {"x": 1}, 1),
@@ -372,7 +372,7 @@ def __init__(self, x):
 
 
 @pytest.mark.parametrize(
-    "args, kwargs, rv",
+    ("args", "kwargs", "rv"),
     [
         ((0,), {}, 41),
         ((), {"x": 0}, 41),