Skip to content

python-packaging: fix provides#10299

Merged
anphel31 merged 3 commits into3.0-devfrom
anphel/3-python-packaging-provides
Sep 3, 2024
Merged

python-packaging: fix provides#10299
anphel31 merged 3 commits into3.0-devfrom
anphel/3-python-packaging-provides

Conversation

@anphel31
Copy link
Copy Markdown
Member

@anphel31 anphel31 commented Aug 30, 2024

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
Rebuild python-packaging in the toolchain to resolve a circular dependency and fix the auto-generated provides for this package.

Before:

" Traceback (most recent call last):
"   File "/usr/lib/rpm/pythondistdeps.py", line 22, in <module>
"     from packaging.requirements import Requirement as Requirement_
" ModuleNotFoundError: No module named 'packaging'
" Provides: python-packaging = 23.2-3.azl3 python3-packaging = 23.2-3.azl3 python3.12-packaging = 23.2-3.azl3
$ rpm -q --provides ../out/RPMS/noarch/python3-packaging-23.2-2.azl3.noarch.rpm
python-packaging = 23.2-2.azl3
python3-packaging = 23.2-2.azl3
python3.12-packaging = 23.2-2.azl3

After:

Provides: python-packaging = 23.2-3.azl3 python3-packaging = 23.2-3.azl3 python3.12-packaging = 23.2-3.azl3 python3.12dist(packaging) = 23.2 python3dist(packaging) = 23.2
$ rpm -q --provides ../out/RPMS/noarch/python3-packaging-23.2-3.azl3.noarch.rpm
python-packaging = 23.2-3.azl3
python3-packaging = 23.2-3.azl3
python3.12-packaging = 23.2-3.azl3
python3.12dist(packaging) = 23.2
python3dist(packaging) = 23.2
Change Log
  • python-packaging: fix provides
  • python-pygments: rebuild to fix provides
  • python-setuptools: rebuild to fix provides
Does this affect the toolchain?

YES

Associated issues
Test Methodology

@anphel31 anphel31 requested review from a team as code owners August 30, 2024 02:13
Comment thread SPECS/python-packaging/python-packaging.spec
Comment thread toolkit/scripts/toolchain/build_official_toolchain_rpms.sh Outdated
Comment thread SPECS/python-packaging/python-packaging.spec
@mfrw mfrw added the 3.0-dev PRs Destined for AzureLinux 3.0 label Sep 2, 2024
@anphel31 anphel31 merged commit e1958d3 into 3.0-dev Sep 3, 2024
@anphel31 anphel31 deleted the anphel/3-python-packaging-provides branch September 3, 2024 22:19
PawelWMS pushed a commit that referenced this pull request Sep 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants