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

Make python-3.13 version of PYPI_PKG provide virtual py3-PYPI_PKG #36330

Closed
wants to merge 1 commit into from

Conversation

smoser
Copy link
Member

@smoser smoser commented Dec 11, 2024

Make python-3.13 version of PYPI_PKG provide virtual py3-PYPI_PKG

This just makes the python v3.13 version of a package the highest
version. So now, if you do apk add py3-appnope, you'll get
py3.13-appnope where before you would get py3.12-appnope.

The 'set-313.sh' script used to do this looks like:

#!/bin/sh -e
r=' \(["'\'']*3[.]13["'\'']*\): \(["'\'']*\)[0-9]\+\(["'\'']*\)'
n=313

files=$(git grep -l "$r")
set -- $files
echo "$# files"
sed -i -e "s,$r, \1: \2${n}\3," "$@"
wolfictl bump "$@"

I then filtered out those packages that were failing to build/test:
py3-ml-metadata apache-arrow py3-meson-python py3-build
py3-google-apitools py3-cairo libmamba

And those that caused issues with the build solver:
py3-pip py3-supported-python py3-wheel

@smoser smoser enabled auto-merge (squash) December 11, 2024 06:31
xnox
xnox previously approved these changes Dec 11, 2024
@xnox xnox force-pushed the fix/python-3.13-packages branch from 6aeb572 to 8e52bf9 Compare December 11, 2024 13:25

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

@smoser smoser added the ai/skip-comment Stop AI from commenting on PR label Dec 11, 2024
This just makes the python v3.13 version of a package the highest
version.  So now, if you do `apk add py3-appnope`, you'll get
`py3.13-appnope` where before you would get py3.12-appnope.

The 'set-313.sh' script used to do this looks like:

    #!/bin/sh -e
    r=' \(["'\'']*3[.]13["'\'']*\): \(["'\'']*\)[0-9]\+\(["'\'']*\)'
    n=313

    files=$(git grep -l "$r")
    set -- $files
    echo "$# files"
    sed -i -e "s,$r, \1: \2${n}\3," "$@"
    wolfictl bump "$@"

I then filtered out those packages that were failing to build/test:
  py3-ml-metadata apache-arrow py3-meson-python py3-build
  py3-google-apitools py3-cairo libmamba

And those that caused issues with the build solver:
  py3-pip py3-supported-python py3-wheel
@smoser smoser force-pushed the fix/python-3.13-packages branch from 8e52bf9 to 8d9579d Compare December 11, 2024 15:31
@smoser smoser disabled auto-merge December 11, 2024 15:32
@smoser smoser enabled auto-merge (squash) December 11, 2024 15:32
smoser added a commit to smoser/wolfi-os that referenced this pull request Dec 11, 2024
…6420

see similar changes wolfi-dev#36330.
This package is part of 3 that have a dependency loop if all updated
together (py3-pip, py3-supported-python, py3-wheel).
smoser added a commit to smoser/wolfi-os that referenced this pull request Dec 11, 2024
see similar changes wolfi-dev#36330.
This package is part of 3 that have a dependency loop if all updated
together (py3-pip, py3-supported-python, py3-wheel).
xnox pushed a commit that referenced this pull request Dec 11, 2024
see similar changes #36330.
This package is part of 3 that have a dependency loop if all updated
together (py3-pip, py3-supported-python, py3-wheel).
xnox pushed a commit to smoser/wolfi-os that referenced this pull request Dec 11, 2024
see similar changes wolfi-dev#36330.
This package is part of 3 that have a dependency loop if all updated
together (py3-pip, py3-supported-python, py3-wheel).
smoser added a commit that referenced this pull request Dec 11, 2024
see similar changes #36330. This
package is part of 3 that have a dependency loop if all updated together
(py3-pip, py3-supported-python, py3-wheel).
@smoser smoser closed this Dec 11, 2024
auto-merge was automatically disabled December 11, 2024 22:09

Pull request was closed

xnox pushed a commit that referenced this pull request Dec 13, 2024
These packages did not "just work" with some sed changes to move 3.13 as
the highest priority python packages.

py3-build - update python 3.13 version, fix test, improve test 
py3-cairo -  need multiple versions of the py3-cairo-dev 
libmamba - drop python test from base package
py3-google-apitools - do not build 3.13, does not work 

See similar changes #36330
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ai/skip-comment Stop AI from commenting on PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants