Add install-tags filtering for wheel generation by Brishen · Pull Request #267 · mesonbuild/meson-python

Brishen · 2023-01-17T18:57:31Z

This is a PR for #68 comprising entirely of @peter-urban's work.

# Conflicts: # mesonpy/__init__.py

…eration

FFY00 · 2023-01-17T23:05:02Z

mesonpy/__init__.py

-        for cmd in self.build_commands():
-            self._meson(*cmd[1:])
+        self._meson('compile', *self._meson_args['compile'],)
+        if self._meson_args['install-tags']:
+            install_tags = '--tags=' + ','.join(self._meson_args['install-tags'])
+            self._meson('install', '--destdir', os.fspath(self._install_dir), install_tags, *self._meson_args['install'],)
+        else:
+            self._meson('install', '--destdir', os.fspath(self._install_dir), *self._meson_args['install'],)


I think this may have happened because of the merge, but this code now needs to go into build_commands.

True, this is a merge error, my code was still based on a very old version of meson-python

if install-tags is not separated from the "install" args, this whole block can be reverted to
for cmd in self.build_commands(): self._meson(*cmd[1:])

FFY00 · 2023-01-17T23:07:37Z

mesonpy/__init__.py



-MesonArgsKeys = Literal['dist', 'setup', 'compile', 'install']
+MesonArgsKeys = Literal['dist', 'setup', 'compile', 'install', 'install-tags']


I wonder it wouldn't just be better to parse this from the install args.

good point, I'll implement this

Suggested change

MesonArgsKeys = Literal['dist', 'setup', 'compile', 'install', 'install-tags']

MesonArgsKeys = Literal['dist', 'setup', 'compile', 'install']

Thanks! This can be done with argparse and parse_known_args.

FFY00 · 2023-01-17T23:37:45Z

mesonpy/__init__.py

    def _install_plan(self) -> Dict[str, Dict[str, Dict[str, str]]]:
+        install_plan = self._info('intro-install_plan').copy()
+
+        for files in install_plan.values():
+            for file, details in list(files.items()):
+                if details['tag'] not in self._meson_args['install-tags']:
+                    del files[file]


I'm not sure if we should do it here.

i updated this block to parse the "install" args instead of using an extra 'install-tags' field

Suggested change

def _install_plan(self) -> Dict[str, Dict[str, Dict[str, str]]]:

install_plan = self._info('intro-install_plan').copy()

for files in install_plan.values():

for file, details in list(files.items()):

if details['tag'] not in self._meson_args['install-tags']:

del files[file]

def _install_plan(self) -> Dict[str, Dict[str, Dict[str, str]]]:

"""Meson install_plan metadata."""

# copy the install plan so we can modify it

install_plan = self._info('intro-install_plan').copy()

# parse install args for install tags (--tags)

install_tags = []

for arg in self._meson_args['install']:

if arg.strip().startswith('--tags='):

install_tags = arg.split('=', 1)[1].split(',')

break

else:

return install_plan

# filter out files that do not fit the install tags

for files in install_plan.values():

for file, details in list(files.items()):

if details['tag'].strip() not in install_tags:

del files[file]

return install_plan

@FFY00 This is just a suggestion (it was easy to implement it here).
If you give me some hints or thoughts on your doubts I could look for a better place to put this filter.

This is a bit fragile, and I'd prefer not having to maintain it. I think it should be pretty easy to use argparse, as I mentioned in #267 (comment). What do you think?

Oh ja, I didn't see the comment 🙂 I'll update the suggestion tomorrow

No worries. Thank you 😊

Updated the suggestion to use argparse

Suggested change

def _install_plan(self) -> Dict[str, Dict[str, Dict[str, str]]]:

install_plan = self._info('intro-install_plan').copy()

for files in install_plan.values():

for file, details in list(files.items()):

if details['tag'] not in self._meson_args['install-tags']:

del files[file]

def _install_plan(self) -> Dict[str, Dict[str, Dict[str, str]]]:

"""Meson install_plan metadata."""

# copy the install plan so we can modify it

install_plan = self._info('intro-install_plan').copy()

# parse install args for install tags (--tags)

parser = argparse.ArgumentParser()

parser.add_argument('--tags')

args, _ = parser.parse_known_args(self._meson_args['install'])

# filter the install_plan for files that do not fit the install tags

if args.tags:

install_tags = args.tags.split(',')

for files in install_plan.values():

for file, details in list(files.items()):

if details['tag'].strip() not in install_tags:

del files[file]

return install_plan

naturally this needs import argparse at the beginning of the file

peter-urban · 2023-01-18T01:00:03Z

@Brishen I implemented the above made code suggestions in my fork. Could you update your PR? :-)

peter-urban · 2023-01-21T11:22:22Z

@Brishen is it possible for you to update this pull request to adapt it to FFY00s comments?
You could again merge the it again against the main branch of my fork. :-)
Cheers

peter-urban · 2023-01-31T14:59:25Z

Hi @Brishen, it seems that you have no time to update this PR. I grew a bit impatiens and, since this PR is based on my changes anyways, took the liberty to create a new, updated PR (#286)

Hope that is no problem for you :-)

FFY00 · 2023-02-01T20:58:46Z

Closed in favor of #288.

peter-urban and others added 6 commits November 25, 2022 16:20

add unofficial 'install-tags' option

a7ad70c

Merge branch 'origin-main' into fork-main

dc77812

Merge remote-tracking branch 'origin/main' into fork-main

85e7092

Merge remote-tracking branch 'origin/main' into fork-main

d2d9ee2

Merge remote-tracking branch 'original/main'

1acfde3

# Conflicts: # mesonpy/__init__.py

Update formatting in __init__.py

794bf78

peter-urban added a commit to themachinethatgoesping/meson-python that referenced this pull request Jan 17, 2023

Pull Request mesonbuild#267: Add install-tags filtering for wheel gen…

1158210

…eration

FFY00 reviewed Jan 17, 2023

View reviewed changes

peter-urban mentioned this pull request Jan 31, 2023

ENH: Add install-tags filtering for wheel generation (updated) #286

Closed

FFY00 mentioned this pull request Feb 1, 2023

ENH: add install-tags filtering for wheel generation #288

Merged

FFY00 closed this Feb 1, 2023



		MesonArgsKeys = Literal['dist', 'setup', 'compile', 'install']
		MesonArgsKeys = Literal['dist', 'setup', 'compile', 'install', 'install-tags']

Conversation

Brishen commented Jan 17, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

peter-urban Jan 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

peter-urban Jan 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

peter-urban commented Jan 18, 2023

Uh oh!

peter-urban commented Jan 21, 2023

Uh oh!

peter-urban commented Jan 31, 2023

Uh oh!

FFY00 commented Feb 1, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

peter-urban Jan 18, 2023 •

edited

Loading

peter-urban Jan 18, 2023 •

edited

Loading