Migrate from setuptools to Meson and meson-python #1071
Conversation
chewi
force-pushed
the
meson
branch
2 times, most recently
from
2495cce
to
ee07c78
Compare
chewi
force-pushed
the
meson
branch
27 times, most recently
from
85fc327
to
1343db8
Compare
| @@ -0,0 +1,133 @@ | |||
| install_data( | |||
| [ | |||
There was a problem hiding this comment.
I'm not sure what you mean by this. The first thing that install_data does when receiving a "list of strings or list of files() objects" parameter is internally convert all bare strings into files() objects using the same code that files() uses to check if they exist up front.
Are you aware of cases where this does not happen? If so, then it is a meson bug, because the configure stage should never succeed when the build or install stages can be trivially detected as impossible to succeed, such as for example when rule inputs are missing.
The difference between using strings and using files() objects is supposed to be limited to the fact that files() can be defined in one subdir and used in another subdir while remembering which subdir they were defined in (and therefore always resolving relative to the subdir they were defined in rather than the subdir they were used in).
| 'glsa-check', | ||
| 'gpkg-sign', | ||
| 'portageq', | ||
| 'quickpkg' |
There was a problem hiding this comment.
Although it isn't specified anywhere, muon fmt (an autoformatter provided by the c99 implementation of meson) uses four spaces by default.
Personally I've always been a fan of four spaces, for the same reason I like them in python (and also bash and C/C++).
We've already done that since I opened this. |
SoapGentoo
requested review from
eli-schwartz
and removed request for
eli-schwartz
chewi
force-pushed
the
meson
branch
3 times, most recently
from
2adbb48
to
d901fa5
Compare
chewi
changed the title
|
As far as I'm concerned, we can merge this now, and pick up any pieces once it gets a bit more testing. Any objections? I've been running it for a few days and everything seems fine, although there were 2 missing files I commented about on the ebuild side (gentoo/gentoo#32098 (comment)). I've not investigated that at all and it might've been fixed since. |
Sorry, I missed that comment. I wasn't aware of that issue so I'll take a look. |
|
This makes Portage PEP 517 compliant. When building via meson-python, the man pages and logrotate config are no longer included as there seems little point. Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
The tests call _disable_legacy_globals, but they never reset portage.data._initialized_globals, meaning that the globals never get set again. This led to the test trying to chown with GID 0 as an unprivileged user. This only failed under CI after switching to pytest, despite it working with runTests.py, as well as locally. Running it on its own also worked fine. I don't know how it worked before, maybe it was just the ordering and some luck. Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This is particularly important when Portage is installed in a venv to ensure that other scripts are launched using the same environment. Signed-off-by: James Le Cuirot <chewi@gentoo.org>
It's not clear what bin_entry_point.sh was trying to do before. The regular expression didn't appear to match any likely shebang. The wrapper already runs under the desired Python, so we only need to use sys.executable, which points to the venv's python symlink. We don't need to worry about handling non-Python scripts any more either as the new Meson-based build system just installs these directly to bin rather than creating an entrypoint for them. Any Python-based Portage scripts they execute are now tried from the same directory first and will therefore use the correct environment, as above. Signed-off-by: James Le Cuirot <chewi@gentoo.org>
It was breaking the Portage sandbox. Signed-off-by: James Le Cuirot <chewi@gentoo.org>
|
I've merged this so we can get it some more testing - that doesn't mean more comments and such aren't welcome, obviously. Thank you!! |
It was breaking the Portage sandbox. Signed-off-by: James Le Cuirot <chewi@gentoo.org> Closes: gentoo#1071 Signed-off-by: Sam James <sam@gentoo.org>
It was breaking the Portage sandbox. Signed-off-by: James Le Cuirot <chewi@gentoo.org> Closes: gentoo#1071 Signed-off-by: Sam James <sam@gentoo.org>
This makes Portage PEP 517 compliant.
When building via meson-python, the man pages and logrotate config are no longer included as there seems little point.