@@ -502,10 +502,13 @@ def __call__(
502
502
503
503
@pytest .fixture (scope = "session" )
504
504
def script_factory (
505
- virtualenv_factory : Callable [[Path ], VirtualEnvironment ], deprecated_python : bool , zipapp : Optional [str ]
505
+ virtualenv_factory : Callable [[Path ], VirtualEnvironment ],
506
+ deprecated_python : bool ,
507
+ zipapp : Optional [str ],
506
508
) -> ScriptFactory :
507
509
def factory (
508
- tmpdir : Path , virtualenv : Optional [VirtualEnvironment ] = None ,
510
+ tmpdir : Path ,
511
+ virtualenv : Optional [VirtualEnvironment ] = None ,
509
512
) -> PipTestEnvironment :
510
513
if virtualenv is None :
511
514
virtualenv = virtualenv_factory (tmpdir .joinpath ("venv" ))
@@ -544,6 +547,7 @@ def factory(
544
547
runpy.run_module("pip", run_name="__main__")
545
548
"""
546
549
550
+
547
551
def make_zipapp_from_pip (zipapp_name : Path ) -> None :
548
552
pip_dir = Path (pip_location ).parent
549
553
with zipapp_name .open ("wb" ) as zipapp_file :
@@ -559,9 +563,10 @@ def make_zipapp_from_pip(zipapp_name: Path) -> None:
559
563
zipapp .writestr ("__main__.py" , ZIPAPP_MAIN )
560
564
561
565
562
-
563
566
@pytest .fixture (scope = "session" )
564
- def zipapp (request : pytest .FixtureRequest , tmpdir_factory : pytest .TempPathFactory ) -> Optional [str ]:
567
+ def zipapp (
568
+ request : pytest .FixtureRequest , tmpdir_factory : pytest .TempPathFactory
569
+ ) -> Optional [str ]:
565
570
"""
566
571
If the user requested for pip to be run from a zipapp, build that zipapp
567
572
and return its location. If the user didn't request a zipapp, return None.
0 commit comments