feat: use external pip if available #736
Conversation
Signed-off-by: Henry Schreiner <[email protected]>
Signed-off-by: Henry Schreiner <[email protected]>
src/build/env.py
Outdated
|
|
||
| try: | ||
| return _has_valid_pip() | ||
| except ModuleNotFoundError: # Python 3.7 only |
There was a problem hiding this comment.
I would prefer if we always threw this from _has_valid_pip instead of the cryptic StopIteration, which arguably you should never have to handle, especially at a distance. It would also match importlib's implementation of distribution (singular):
try:
return next(cls.discover(name=name))
except StopIteration:
raise PackageNotFoundError(name)(PackageNotFoundError being a subclass of ModuleNotFoundError.)
There was a problem hiding this comment.
Okay. And the error was if importlib_metadata was missing, though we have it as a dep, so that would only be for bootstrapping. This makes it have the same signature as pip missing, though, so no need to special case.
src/build/env.py
Outdated
| @@ -83,13 +83,29 @@ def _has_valid_pip(purelib: str) -> bool: | |||
| else: | |||
| from importlib import metadata | |||
There was a problem hiding this comment.
Forgot about that. I always call it _compat/importlib (and have a _compat/typing, etc).
There was a problem hiding this comment.
+1 to rename it to _compat/importlib.
| @@ -70,7 +70,7 @@ def _minimum_pip_version() -> str: | |||
| return '19.1.0' | |||
|
|
|||
|
|
|||
| def _has_valid_pip(purelib: str) -> bool: | |||
| def _has_valid_pip(**distargs: object) -> bool: | |||
There was a problem hiding this comment.
I'd rather we didn't lose the typing here, but Python doesn't make it easy:
if typing.TYPE_CHECKING:
from typing_extensions import NotRequired, TypedDict, Unpack
class _Distargs(TypedDict):
path: NotRequired[list[str]]
...
def _has_valid_pip(**distargs: Unpack[_Distargs]) -> bool:There was a problem hiding this comment.
I left it along for now, would prefer a _compat/typing module if we add it.
There was a problem hiding this comment.
I can do that in a separate PR. I also usually have _compat/tomllib (https://github.com/scikit-build/scikit-build-core/tree/main/src/scikit_build_core/_compat for example).
src/build/env.py
Outdated
| @@ -139,6 +155,12 @@ def python_executable(self) -> str: | |||
| """The python executable of the isolated build environment.""" | |||
| return self._python_executable | |||
|
|
|||
| def _pip_args(self, *, isolate: bool = False) -> list[str]: | |||
There was a problem hiding this comment.
This doesn't appear to ever be called without isolate being true.
There was a problem hiding this comment.
Okay, dropped the arg.
src/build/env.py
Outdated
| @@ -201,7 +221,11 @@ def _create_isolated_env_virtualenv(path: str) -> tuple[str, str]: | |||
| """ | |||
| import virtualenv | |||
|
|
|||
| cmd = [str(path), '--no-setuptools', '--no-wheel', '--activators', ''] | |||
| if _valid_global_pip(): | |||
| cmd = [str(path), '--no-seed', '--activators', ''] | |||
There was a problem hiding this comment.
Just inherited from previous code, but okay, changed.
src/build/env.py
Outdated
| _subprocess([executable, '-m', 'pip', 'install', f'pip>={_minimum_pip_version()}']) | ||
|
|
||
| # Avoid the setuptools from ensurepip to break the isolation | ||
| _subprocess([executable, '-m', 'pip', 'uninstall', 'setuptools', '-y']) | ||
| if _valid_global_pip(): |
There was a problem hiding this comment.
Redundant, setuptools is not installed if with_pip is false. (It is also not installed on Python 3.12+.)
There was a problem hiding this comment.
Ah, okay, yes. Removed this branch.
henryiii
force-pushed
the
henryiii/feat/externalpip
branch
2 times, most recently
from
c5ac342
to
afe6f02
Compare
Signed-off-by: Henry Schreiner <[email protected]>
henryiii
force-pushed
the
henryiii/feat/externalpip
branch
from
afe6f02
to
04dd0d1
Compare
Trying #733 out. Pip is used if it is in the same environment as build and new enough. Saves a bit of time setting up the venvs. Haven't worked on tests yet.
From quick testing building both an sdist and wheel for itself with virtualenv installed this goes from about 4.7 seconds to 3.2 seconds. With
venvonly, it goes from 10.5 seconds to 4.4 seconds.FYI, with
uv(hacked in) it took 2.36 secs.(This is a very simple build, of course, with only a small handful of deps)
uv's experimental native build support took 571ms, but that's only building the wheel (above is SDist and wheel).