scripts/pythondistdeps: Implement provides/requires for extras packages + Rework error messages #1546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously the error messages were printed to stdout, they were part of the output of the script. Thus the words were treated like dependencies, sorted alphabetically, thus rendering the message unreadable. This change prints a single keyword indicating the error and details are outputted to stderr. It also outputs *** on purpose to ensure the dependency would not be valid, causing a failure of the build.
jollaitbot
pushed a commit
to sailfishos-mirror/python-rpm-generators
that referenced
this pull request
Feb 19, 2021
…stream Upstream change to importlib.metadata: rpm-software-management/rpm#1317 Due to extras packages being hadled slightly differently by importlib, one test case for this was added. And due to changes in handling requires.txt files, comments were removed from the pyreq2rpm.tests testing package. Also because of the switch, we removed the dependency on setuptools and added a dependency on packaging. Note: Some packages with egg-info files might provide a different name due to this change if there is a conflict between the filename and the name in the metadata. Previously, the filename was sometimes used to parse the name, now it is always the content of that file, which is what packaging does, and thus also pip and other Python tooling. Currently, this is known to affect only 1 package in Fedora (ntpsec). The resulting script is different from upstream because of not yet upstreamed changes in Fedora: - scripts/pythondistdeps: Rework error messages - scripts/pythondistdeps: Add parameter --package-name - scripts/pythondistdeps: Implement provides/requires for extras packages - pythondistdeps.py: When parsing extras name, take the rightmost + These changes are proposed in this upstream PR: rpm-software-management/rpm#1546
|
Note: We should include https://src.fedoraproject.org/rpms/python-rpm-generators/pull-request/35 |
|
@torsava Could you please reopen this to https://github.com/rpm-software-management/python-rpm-packaging ? |
3 tasks
|
I'm closing this PR as it has been reopened against the newly separate python-rpm-packaging project: rpm-software-management/python-rpm-packaging#7 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In Fedora we have adapted the pythondistdeps.py script (that generates python3.Xdist(foo) dependencies) to also generate requirements on Python extras (e.g. python3.Xdist(foo[bar])) whenever upstream metadata indicate such dependency.
The script was also adapted to be able to process a new Python extras packages that have the format
base_package+extras_name(e.g.python3-setuptools_scm+toml) and generate provides and requires for them.This has been implemented in Fedora 33: https://fedoraproject.org/wiki/Changes/PythonExtras
The change also includes an improvement of the error messages: Previously the error messages were printed to stdout, they were part of the output of the script, and thus the words were treated like dependencies, sorted alphabetically, thus rendering the message unreadable. This change prints a single keyword indicating the error and details are outputted to stderr. It also outputs *** on purpose to ensure the dependency would not be valid, causing a failure of the build.