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

Migrate to PEP517 meson-python build #36

Closed

Conversation

zmedico
Copy link
Member

@zmedico zmedico commented Oct 9, 2023

Based heavily on gentoo/portage#1071. Ebuild changes in gentoo/gentoo#33257.
Bug: https://bugs.gentoo.org/909888

@zmedico zmedico force-pushed the bug_909888_pep517_meson-python branch 7 times, most recently from daaa07f to 1f55c34 Compare October 9, 2023 06:31
@thesamesam
Copy link
Member

Thanks!

If I use app-portage/iwdevtools and diff the image, I get:

>>> Merging app-portage/gentoolkit-9999 to /
 * CMP: =app-portage/gentoolkit-9999 with app-portage/gentoolkit-9999/image
 *  FILES:-usr/bin/eclean-pkg
 *  FILES:-usr/lib/pypy3.10/site-packages/gentoolkit-*-py3.10.egg-info
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/Makefile
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/README
 *  FILES:-usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/ekeyword.py (-rw-r--r-- root:root)
 *  FILES:-usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/test_ekeyword.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/ekeyword.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/pytest.ini
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/test_ekeyword.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/tests/process-1.ebuild
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/arch.list
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/arches.desc
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/profiles.desc
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/tests/profiles/both/profiles/arch.list
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/ekeyword/tests/profiles/both/profiles/profiles.desc
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/enalyze/meson.build
 *  FILES:-usr/lib/pypy3.10/site-packages/gentoolkit/imlate/imlate.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/imlate/imlate.py (-rwxr-xr-x root:root)
 *  FILES:-usr/lib/pypy3.10/site-packages/gentoolkit/test/eclean/test_clean.py (-rw-r--r-- root:root)
 *  FILES:-usr/lib/pypy3.10/site-packages/gentoolkit/test/eclean/test_search.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/test/eclean/test_clean.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/pypy3.10/site-packages/gentoolkit/test/eclean/test_search.py (-rwxr-xr-x root:root)
 *  FILES:-usr/lib/python-exec/pypy3/eclean-pkg
 *  FILES:-usr/lib/python-exec/python3.10/eclean-pkg
 *  FILES:-usr/lib/python-exec/python3.11/eclean-pkg
 *  FILES:-usr/lib/python-exec/python3.12/eclean-pkg
 *  FILES:-usr/lib/python3.10/site-packages/gentoolkit-*-py3.10.egg-info
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/Makefile
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/README
 *  FILES:-usr/lib/python3.10/site-packages/gentoolkit/ekeyword/ekeyword.py (-rw-r--r-- root:root)
 *  FILES:-usr/lib/python3.10/site-packages/gentoolkit/ekeyword/test_ekeyword.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/ekeyword.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/pytest.ini
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/test_ekeyword.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/tests/process-1.ebuild
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/arch.list
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/arches.desc
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/profiles.desc
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/tests/profiles/both/profiles/arch.list
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/ekeyword/tests/profiles/both/profiles/profiles.desc
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/enalyze/meson.build
 *  FILES:-usr/lib/python3.10/site-packages/gentoolkit/imlate/imlate.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/imlate/imlate.py (-rwxr-xr-x root:root)
 *  FILES:-usr/lib/python3.10/site-packages/gentoolkit/test/eclean/test_clean.py (-rw-r--r-- root:root)
 *  FILES:-usr/lib/python3.10/site-packages/gentoolkit/test/eclean/test_search.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/test/eclean/test_clean.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.10/site-packages/gentoolkit/test/eclean/test_search.py (-rwxr-xr-x root:root)
 *  FILES:-usr/lib/python3.11/site-packages/gentoolkit-*-py3.11.egg-info
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/Makefile
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/README
 *  FILES:-usr/lib/python3.11/site-packages/gentoolkit/ekeyword/ekeyword.py (-rw-r--r-- root:root)
 *  FILES:-usr/lib/python3.11/site-packages/gentoolkit/ekeyword/test_ekeyword.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/ekeyword.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/pytest.ini
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/test_ekeyword.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/tests/process-1.ebuild
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/arch.list
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/arches.desc
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/profiles.desc
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/tests/profiles/both/profiles/arch.list
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/ekeyword/tests/profiles/both/profiles/profiles.desc
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/enalyze/meson.build
 *  FILES:-usr/lib/python3.11/site-packages/gentoolkit/imlate/imlate.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/imlate/imlate.py (-rwxr-xr-x root:root)
 *  FILES:-usr/lib/python3.11/site-packages/gentoolkit/test/eclean/test_clean.py (-rw-r--r-- root:root)
 *  FILES:-usr/lib/python3.11/site-packages/gentoolkit/test/eclean/test_search.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/test/eclean/test_clean.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.11/site-packages/gentoolkit/test/eclean/test_search.py (-rwxr-xr-x root:root)
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit-*-py3.12.egg-info/PKG-INFO
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit-*-py3.12.egg-info/SOURCES.txt
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit-*-py3.12.egg-info/dependency_links.txt
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit-*-py3.12.egg-info/not-zip-safe
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit-*-py3.12.egg-info/top_level.txt
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/Makefile
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/README
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit/ekeyword/ekeyword.py (-rw-r--r-- root:root)
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit/ekeyword/test_ekeyword.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/ekeyword.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/pytest.ini
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/test_ekeyword.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/tests/process-1.ebuild
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/arch.list
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/arches.desc
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/tests/profiles/arches-desc/profiles/profiles.desc
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/tests/profiles/both/profiles/arch.list
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/ekeyword/tests/profiles/both/profiles/profiles.desc
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/enalyze/meson.build
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit/imlate/imlate.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/imlate/imlate.py (-rwxr-xr-x root:root)
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit/test/eclean/test_clean.py (-rw-r--r-- root:root)
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit/test/eclean/test_search.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/test/eclean/test_clean.py (-rwxr-xr-x root:root)
 *  FILES:-usr/lib/python3.12/site-packages/gentoolkit/test/eclean/test_search.py (-rw-r--r-- root:root)
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/test/eclean/test_clean.py (-rwxr-xr-x root:root)
 *  FILES:+usr/lib/python3.12/site-packages/gentoolkit/test/eclean/test_search.py (-rwxr-xr-x root:root)
 *   SIZE: 21.36MiB -> 18.59MiB, 1346 -> 1373 files
 * ------> FILES(+60,-33) SIZE(-12.97%)

two issues:

  • it installs the meson.build files
  • eclean-pkg is missing

@zmedico zmedico force-pushed the bug_909888_pep517_meson-python branch from 1f55c34 to 42457da Compare October 9, 2023 18:04
@zmedico zmedico force-pushed the bug_909888_pep517_meson-python branch from 42457da to 8b84cc4 Compare October 9, 2023 18:14
@zmedico
Copy link
Member Author

zmedico commented Oct 9, 2023

two issues:

  • it installs the meson.build files
  • eclean-pkg is missing

Fixed now. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants