chore: cleanup after rebase

Signed-off-by: Henry Schreiner <[email protected]>

nox/_decorators.py

@@ -122,9 +122,7 @@ def format_dependency(self, dependency: str) -> str:
                 msg = "Cannot parametrize requires with {python} when python is None or a bool."
                 raise ValueError(msg)
             return formatted
-        msg = (
-            "The requires of a not-yet-parametrized session cannot be parametrized."
-        )  # pragma: no cover
+        msg = "The requires of a not-yet-parametrized session cannot be parametrized."  # pragma: no cover
         raise TypeError(msg)  # pragma: no cover
 
 

nox/registry.py

@@ -45,8 +45,7 @@ def session_decorator(
     *,
     default: bool = ...,
     requires: Sequence[str] | None = ...,
-) -> Callable[[F], F]:
-    ...
+) -> Callable[[F], F]: ...
 
 
 def session_decorator(

tests/resources/noxfile_requires.py

@@ -57,9 +57,6 @@ def h(session):
     print(session.name)
 
 
-#
-
-
 @nox.session(requires=["j"])
 def i(session):
     print(session.name)
@@ -70,9 +67,6 @@ def j(session):
     print(session.name)
 
 
-#
-
-
 @nox.session(python=["3.9", "3.10"])
 def k(session):
     print(session.name)
@@ -88,17 +82,11 @@ def n(session):
     print(session.name)
 
 
-#
-
-
 @nox.session(requires=["does_not_exist"])
 def o(session):
     print(session.name)
 
 
-#
-
-
 @nox.session(python=["3.9", "3.10"])
 def p(session):
     print(session.name)
@@ -109,9 +97,6 @@ def q(session):
     print(session.name)
 
 
-#
-
-
 @nox.session
 def r(session):
     print(session.name)

tests/test__parametrize.py

@@ -248,7 +248,7 @@ def test_generate_calls_ids():
 
 
 def test_generate_calls_tags():
-    f = mock.Mock(should_warn={}, tags=[])
+    f = mock.Mock(should_warn={}, tags=[], requires=[])
     f.__name__ = "f"
 
     arg_names = ("foo",)
@@ -267,7 +267,7 @@ def test_generate_calls_tags():
 
 
 def test_generate_calls_merge_tags():
-    f = mock.Mock(should_warn={}, tags=["tag1", "tag2"])
+    f = mock.Mock(should_warn={}, tags=["tag1", "tag2"], requires=[])
     f.__name__ = "f"
 
     arg_names = ("foo",)