Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

poc: foreign pip #6458

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/poetry/inspection/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from poetry.core.version.markers import InvalidMarker

from poetry.utils.env import EnvCommandError
from poetry.utils.env import ephemeral_environment
from poetry.utils.env.context import ephemeral_environment
from poetry.utils.setup_reader import SetupReader


Expand Down
5 changes: 3 additions & 2 deletions src/poetry/installation/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from poetry.utils.env import EnvCommandError
from poetry.utils.helpers import pluralize
from poetry.utils.helpers import remove_directory
from poetry.utils.pip import pip_install
from poetry.utils.pip import Pip


if TYPE_CHECKING:
Expand Down Expand Up @@ -118,7 +118,8 @@ def pip_install(
self, req: Path, upgrade: bool = False, editable: bool = False
) -> int:
try:
pip_install(req, self._env, upgrade=upgrade, editable=editable)
pip = Pip(target_env=self._env)
pip.install_archive(req, editable=editable, upgrade=upgrade)
except EnvCommandError as e:
output = decode(e.e.output)
if (
Expand Down
17 changes: 10 additions & 7 deletions src/poetry/installation/pip_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from poetry.repositories.http import HTTPRepository
from poetry.utils._compat import encode
from poetry.utils.helpers import remove_directory
from poetry.utils.pip import pip_install
from poetry.utils.pip import Pip


if TYPE_CHECKING:
Expand Down Expand Up @@ -231,12 +231,14 @@ def install_directory(self, package: Package) -> str | int:
with contextlib.suppress(RuntimeError):
package_poetry = Factory().create_poetry(pyproject.file.path.parent)

pip = Pip(target_env=self._env)

if package_poetry is not None:
# Even if there is a build system specified
# some versions of pip (< 19.0.0) don't understand it
# so we need to check the version of pip to know
# if we can rely on the build system
legacy_pip = self._env.pip_version < Version.from_parts(19, 0, 0)
legacy_pip = pip.version() < Version.from_parts(19, 0, 0)

builder: Builder
if package.develop and not package_poetry.package.build_script:
Expand All @@ -259,15 +261,16 @@ def install_directory(self, package: Package) -> str | int:
builder = SdistBuilder(package_poetry)

with builder.setup_py():
return pip_install(
return pip.install_archive(
path=req,
environment=self._env,
upgrade=True,
editable=package.develop,
upgrade=True,
)

return pip_install(
path=req, environment=self._env, upgrade=True, editable=package.develop
return pip.install_archive(
path=req,
editable=package.develop,
upgrade=True,
)

def install_git(self, package: Package) -> None:
Expand Down
12 changes: 7 additions & 5 deletions src/poetry/masonry/builders/editable.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

from poetry.utils._compat import WINDOWS
from poetry.utils._compat import decode
from poetry.utils.env import build_environment
from poetry.utils.env.context import build_environment
from poetry.utils.helpers import is_dir_writable
from poetry.utils.pip import pip_install
from poetry.utils.pip import Pip


if TYPE_CHECKING:
Expand Down Expand Up @@ -101,15 +101,17 @@ def _setup_build(self) -> None:
f.write(decode(builder.build_setup()))

try:
if self._env.pip_version < Version.from_parts(19, 0):
pip_install(self._path, self._env, upgrade=True, editable=True)
pip = Pip(target_env=self._env)

if pip.version() < Version.from_parts(19, 0):
pip.install_archive(self._path, editable=True, upgrade=True)
else:
# Temporarily rename pyproject.toml
shutil.move(
str(self._poetry.file), str(self._poetry.file.with_suffix(".tmp"))
)
try:
pip_install(self._path, self._env, upgrade=True, editable=True)
pip.install_archive(self._path, editable=True, upgrade=True)
finally:
shutil.move(
str(self._poetry.file.with_suffix(".tmp")),
Expand Down
Loading