Run ruff check . --select PT022 --fix + manual fix of return type

Author: notatallshaw

tests/conftest.py

@@ -477,7 +477,7 @@ def virtualenv_template(
     setuptools_install: Path,
     wheel_install: Path,
     coverage_install: Path,
-) -> Iterator[VirtualEnvironment]:
+) -> VirtualEnvironment:
     venv_type: VirtualEnvironmentType
     if request.config.getoption("--use-venv"):
         venv_type = "venv"
@@ -522,7 +522,7 @@ def virtualenv_template(
     # it's not reused by mistake from one of the copies.
     venv_template = tmpdir / "venv_template"
     venv.move(venv_template)
-    yield venv
+    return venv
 
 
 @pytest.fixture(scope="session")
@@ -538,14 +538,14 @@ def factory(tmpdir: Path) -> VirtualEnvironment:
 @pytest.fixture
 def virtualenv(
     virtualenv_factory: Callable[[Path], VirtualEnvironment], tmpdir: Path
-) -> Iterator[VirtualEnvironment]:
+) -> VirtualEnvironment:
     """
     Return a virtual environment which is unique to each test function
     invocation created inside of a sub directory of the test function's
     temporary directory. The returned object is a
     ``tests.lib.venv.VirtualEnvironment`` object.
     """
-    yield virtualenv_factory(tmpdir.joinpath("workspace", "venv"))
+    return virtualenv_factory(tmpdir.joinpath("workspace", "venv"))
 
 
 @pytest.fixture(scope="session")

tests/unit/resolution_resolvelib/conftest.py

@@ -21,13 +21,13 @@
 
 
 @pytest.fixture
-def finder(data: TestData) -> Iterator[PackageFinder]:
+def finder(data: TestData) -> PackageFinder:
     session = PipSession()
     scope = SearchScope([str(data.packages)], [], False)
     collector = LinkCollector(session, scope)
     prefs = SelectionPreferences(allow_yanked=False)
     finder = PackageFinder.create(collector, prefs)
-    yield finder
+    return finder
 
 
 @pytest.fixture
@@ -53,8 +53,8 @@ def preparer(finder: PackageFinder) -> Iterator[RequirementPreparer]:
 
 
 @pytest.fixture
-def factory(finder: PackageFinder, preparer: RequirementPreparer) -> Iterator[Factory]:
-    yield Factory(
+def factory(finder: PackageFinder, preparer: RequirementPreparer) -> Factory:
+    return Factory(
         finder=finder,
         preparer=preparer,
         make_install_req=install_req_from_line,
@@ -68,8 +68,8 @@ def factory(finder: PackageFinder, preparer: RequirementPreparer) -> Iterator[Fa
 
 
 @pytest.fixture
-def provider(factory: Factory) -> Iterator[PipProvider]:
-    yield PipProvider(
+def provider(factory: Factory) -> PipProvider:
+    return PipProvider(
         factory=factory,
         constraints={},
         ignore_dependencies=False,

tests/unit/resolution_resolvelib/test_requirement.py

@@ -32,7 +32,7 @@ def _is_satisfied_by(requirement: Requirement, candidate: Candidate) -> bool:
 
 
 @pytest.fixture
-def test_cases(data: TestData) -> Iterator[List[Tuple[str, str, int]]]:
+def test_cases(data: TestData) -> List[Tuple[str, str, int]]:
     def _data_file(name: str) -> Path:
         return data.packages.joinpath(name)
 
@@ -61,7 +61,7 @@ def data_url(name: str) -> str:
         # TODO: directory, editables
     ]
 
-    yield test_cases
+    return test_cases
 
 
 def test_new_resolver_requirement_has_name(

tests/unit/test_network_cache.py

@@ -11,10 +11,10 @@
 
 
 @pytest.fixture(scope="function")
-def cache_tmpdir(tmpdir: Path) -> Iterator[Path]:
+def cache_tmpdir(tmpdir: Path) -> Path:
     cache_dir = tmpdir.joinpath("cache")
     cache_dir.mkdir(parents=True)
-    yield cache_dir
+    return cache_dir
 
 
 class TestSafeFileCache: