Prototype support for PEP 739 #13945
Conversation
FFY00
force-pushed
the
pep-739-prototype
branch
from
ea9aed7 to
697e20c
Compare
|
Rebased on |
FFY00
force-pushed
the
pep-739-prototype
branch
2 times, most recently
from
64f9781 to
e9deda3
Compare
Thanks! I have requested a review for the PEP, so hopefully we should hear something soon. If it gets accepted, I'll add the file to CPython as soon as possible, so it should be available on the following release. I'll also publish a package to generate the build config file to PyPI, so that we can use it on older Python versions, or Python implementations that do not ship it, as long as you are able to run code on the target. Afterwards, in a followup to PEP 739, I also want to standardize a file for the installation environment, which will provide the installation paths. We'll ship a file for the default environment, and unless we run into some issue, I'll also get |
FFY00
force-pushed
the
pep-739-prototype
branch
3 times, most recently
from
e3b2bfb to
7ca5393
Compare
Signed-off-by: Filipe Laíns <[email protected]>
Signed-off-by: Filipe Laíns <[email protected]>
FFY00
force-pushed
the
pep-739-prototype
branch
from
7ca5393 to
43fcae5
Compare
…figDependency Signed-off-by: Filipe Laíns <[email protected]>
Signed-off-by: Filipe Laíns <[email protected]>
FFY00
force-pushed
the
pep-739-prototype
branch
from
43fcae5 to
f30406d
Compare
|
The PEP has been accepted. https://peps.python.org/pep-0739/ I'll add support for it in Python 3.14, and then come back to this PR. |
| if mesonlib.version_compare(schema_version, f'> {self.IMPLEMENTED_VERSION}'): | ||
| mlog.log( | ||
| f'python.build_config has schema_version {schema_version!r}, ' | ||
| f'but we only implement suport for {self.IMPLEMENTED_VERSION!r}, ' |
There was a problem hiding this comment.
| f'but we only implement suport for {self.IMPLEMENTED_VERSION!r}, ' | |
| f'but we only implement support for {self.IMPLEMENTED_VERSION!r}, ' |
There was a problem hiding this comment.
And a few lines up as well.
| mlog.debug( | ||
| f'{pkg_name!r} could not be found in {pkg_libdir_origin}, ' | ||
| 'this is likely due to a relocated python installation' | ||
| ) |
There was a problem hiding this comment.
I think if we end up line-breaking we would usually do it like:
mlog.debug(f'{pkg_name!r} could not be found in {pkg_libdir_origin}, '
'this is likely due to a relocated python installation')| extra_paths: T.List[str] = self.env.coredata.optstore.get_value(key)[:] | ||
| extra_paths: T.List[str] = self.env.coredata.optstore.get_value(key)[:] + self.extra_paths |
There was a problem hiding this comment.
Hmm, I see what you're doing here. You allow a PkgConfigDependency to take an additional PKG_CONFIG_PATH which is joined to the one in the cross file, which also means we don't need to push/pop os.environ.
On the flip side, the way we previously used it was via PKG_CONFIG_LIBDIR which was more narrowly scoped. I suspect this change means we can accidentally fall back to a different python than the one we were searching for (but still the same major.minor version at least)...
There was a problem hiding this comment.
Ah hold on, we anyways fall back to checking for pkg-config without the internal LIBPC which means this is actually doing exactly what we want with one less check. Heh. :)
| @@ -256,7 +262,7 @@ def _check_pkgconfig(self, pkgbin: ExternalProgram) -> T.Optional[str]: | |||
| def _get_env(self, uninstalled: bool = False) -> EnvironmentVariables: | |||
| env = EnvironmentVariables() | |||
| key = OptionKey('pkg_config_path', machine=self.for_machine) | |||
| extra_paths: T.List[str] = self.env.coredata.optstore.get_value(key)[:] | |||
| extra_paths: T.List[str] = self.env.coredata.optstore.get_value(key)[:] + self.extra_paths | |||
There was a problem hiding this comment.
We don't need the cryptic copy of the first list anymore, right?
| if sys.version_info >= (3, 8): | ||
| from functools import cached_property | ||
| else: | ||
| cached_property = property |
There was a problem hiding this comment.
We have a lazy_property in utils somewhere now. It's provides more or less what cached_property does (although it's simpler and expects the attribute to be write once)
| with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as python_build_config_file: | ||
| json.dump(python_build_config, fp=python_build_config_file) | ||
|
|
||
| with tempfile.NamedTemporaryFile(mode='w', delete=False, encoding='utf-8') as cross_file: |
There was a problem hiding this comment.
Neither of these get cleaned up right now, do they?
The overall goal is to support targeting Python installations without need for introspection, given all necessary information is given externally.
This is built upon:
_sysconfigdatato a JSON file python/cpython#127178, forpy_installation.get_variable/py_installation.has_variablesupportThis PR is just a prototype, as I work to get all necessary pieces finalized.