Move away from soon-to-be-removed PipInstaller

tox_poetry_installer/_poetry.py

@@ -29,8 +29,12 @@ from tox_poetry_installer import exceptions
 
 try:
     from cleo.io.null_io import NullIO
+    from poetry.config.config import Config
+    from poetry.core.packages.dependency import Dependency as PoetryDependency
+    from poetry.core.packages.package import Package as PoetryPackage
     from poetry.factory import Factory
-    from poetry.installation.pip_installer import PipInstaller
+    from poetry.installation.executor import Executor
+    from poetry.installation.operations.install import Install
     from poetry.poetry import Poetry
     from poetry.utils.env import VirtualEnv
 except ImportError:

tox_poetry_installer/installer.py

@@ -9,7 +9,6 @@ from datetime import datetime
 from typing import Collection
 from typing import Set
 
-from poetry.core.packages.package import Package as PoetryPackage
 from tox.tox_env.api import ToxEnv as ToxVirtualEnv
 
 from tox_poetry_installer import logger
@@ -22,7 +21,7 @@ if typing.TYPE_CHECKING:
 def install(
     poetry: "_poetry.Poetry",
     venv: ToxVirtualEnv,
-    packages: Collection[PoetryPackage],
+    packages: Collection["_poetry.PoetryPackage"],
     parallels: int = 0,
 ):
     """Install a bunch of packages to a virtualenv
@@ -37,18 +36,19 @@ def install(
 
     logger.info(f"Installing {len(packages)} packages to environment at {venv.env_dir}")
 
-    pip = _poetry.PipInstaller(
+    install_executor = _poetry.Executor(
         env=utilities.convert_virtualenv(venv),
         io=_poetry.NullIO(),
         pool=poetry.pool,
+        config=_poetry.Config(),
     )
 
-    installed: Set[PoetryPackage] = set()
+    installed: Set[_poetry.PoetryPackage] = set()
 
-    def logged_install(dependency: PoetryPackage) -> None:
+    def logged_install(dependency: _poetry.PoetryPackage) -> None:
         start = datetime.now()
         logger.debug(f"Installing {dependency}")
-        pip.install(dependency)
+        install_executor.execute([_poetry.Install(package=dependency)])
         end = datetime.now()
         logger.debug(f"Finished installing {dependency} in {end - start}")