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

drop python req from pip-build-install, move to pip-build-install, add tests #26822

Closed
wants to merge 1 commit into from

Conversation

smoser
Copy link
Contributor

@smoser smoser commented Aug 21, 2024

There are lots of changes here, centered around removing all occurences of SETUPTOOLS_SCM_PRETEND_VERSION. That seems to be not necessary now, at least with the current pip-build-install workflow.

  • do not require 'python' setting in pip-build-install. Default to using the target of the 'python3' link. If not present, user has to supply it.

    Also use contextdir rather than subpkgdir so it can be used from "main" packages also.

  • replace any packages that had SETUPTOOLS_SCM_PRETEND_VERSION with py/pip-build-install.

  • Add tests to touched packages

  • Drop 'python3' runtime dep from touched packages.

  • Fix uninstallable py3-gcloud-aio-storage which conflicted with its dependency py3-gcloud-aio-auth as they both provided usr/lib/python3.12/site-packages/gcloud/py.typed

  • Fix the provides in py3-maturin-bin packages to provide py3-maturin-bin rather than just py3-maturin. That also fixes py3-pendulum which was failing to build because it actually needs 'maturin' executable but that was not being provided by the 'py3-maturin' dep.

  • Fix pendulum's dependency that had py3-pytzdata, it's deps list 'tzdata'

  • Drop the now-unused py3-pytzdata

Note the 'python3' shell snippet in py3-rich and others is painful. See #26818 for more context.

@smoser smoser force-pushed the fix/use-setuptools-scm branch 6 times, most recently from 83bede7 to 34cf75c Compare August 21, 2024 19:00
…d tests

There are lots of changes here, centered around removing all occurences
of SETUPTOOLS_SCM_PRETEND_VERSION.  That seems to be not necessary now,
at least with the current pip-build-install workflow.

 * do not require 'python' setting in pip-build-install.  Default to
   using the target of the 'python3' link. If not present, user
   has to supply it.

   Also use contextdir rather than subpkgdir so it can be used from "main"
   packages also.

 * replace any packages that had SETUPTOOLS_SCM_PRETEND_VERSION with
   py/pip-build-install.

 * py3-cppy has a runtime dep on setuptools

 * Add tests to touched packages

 * Drop 'python3' runtime dep from touched packages.

 * Fix uninstallable py3-gcloud-aio-storage which conflicted with
   its dependency py3-gcloud-aio-auth as they both provided
   usr/lib/python3.12/site-packages/gcloud/py.typed

 * Fix the provides in py3-maturin-bin packages to provide py3-maturin-bin
   rather than just py3-maturin.  That also fixes py3-pendulum which
   was failing to build because it actually needs 'maturin' executable
   but that was not being provided by the 'py3-maturin' dep.

 * Fix pendulum's dependency that had py3-pytzdata, it's deps list 'tzdata'

 * Drop the now-unused py3-pytzdata

Note the 'python3' shell snippet in py3-rich and others is painful.
See wolfi-dev#26818 for more context.
@smoser
Copy link
Contributor Author

smoser commented Aug 22, 2024

closing this for now in favor of 2 steps.
#26914 is the first step, just to improve the pipelines and do one package.

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.

1 participant