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

distutils-r1.eclass: next batch of updates #35913

Closed
wants to merge 8 commits into from

Conversation

mgorny
Copy link
Member

@mgorny mgorny commented Mar 25, 2024

  • bump minimal deps
  • replace pdm-pep517 with pdm-backend finally
  • remove nosetests support
  • fix unittest with 3.12 only
  • remove more junk from .dist-info

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @mgorny
Areas affected: ebuilds, eclasses
Packages affected: dev-python/boto, dev-python/jsonref, sci-biology/biopandas, sci-chemistry/nmrglue

dev-python/boto: @gentoo/python
dev-python/jsonref: @gentoo/python
sci-biology/biopandas: @gentoo/sci-biology
sci-chemistry/nmrglue: @gentoo/sci-chemistry

Linked bugs

Bugs linked: 927818, 926964


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Mar 25, 2024
Comment on lines 1320 to 1326
# remove installed licenses
find "${root}$(python_get_sitedir)" -depth \
\( -path '*.dist-info/COPYING*' \
-o -path '*.dist-info/LICENSE*' \
-o -path '*.dist-info/license_files/*' \
-o -path '*.dist-info/license_files' \
-o -path '*.dist-info/licenses/*' \
-o -path '*.dist-info/licenses' \
# remove installed licenses and other junk
find "${root}$(python_get_sitedir)" -depth -path '*.dist-info/*' \
\! \( -name 'METADATA' \
-o -name 'WHEEL' \
-o -name 'entry_points.txt' \
-o -name 'pbr.json' \
-o -name 'top_level.txt' \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I said in IRC, I don't believe this is robust handling. A backend can choose to install files which are not documented in the spec, but which have tool-specific meaning, and require those files.

Your response was to cherry-pick the single example I gave and allow that file as well.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2024-03-25 19:41 UTC
Newest commit scanned: 7974246
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/1c741a9472/output.html

Copy link
Member

@arthurzam arthurzam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you

@@ -33,18 +33,9 @@ RDEPEND="

BDEPEND="
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I already see it, so might as well ask.
In @mgorny style rules, do you prefer multiline or just BDEPEND="${RDEPEND}" when direct assign?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer multi-line, since you don't have to change it if you need to add more deps.

@@ -628,11 +628,11 @@ distutils_enable_tests() {
;;
unittest)
# unittest-or-fail is needed in py<3.12
test_deps+="
$(python_gen_cond_dep '
local test_pkgs="$(python_gen_cond_dep '
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need " quoting here (since direct $() assign into var). But maybe safer to include them in case someone modifies in future...

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Refactor `distutils_enable_tests pytest` to move `test_pkgs` logic
straight into pytest block, as it is not used by any other variant
anymore.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
Closes: https://bugs.gentoo.org/926964
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Closes: https://bugs.gentoo.org/927818
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Explicitly error out if epytest is run without an appropriate async
plugin, and the test suite contains async tests.  Currently, these tests
are skipped with a warning but that is usually a mistake, and one can
easily miss it when pytest-asyncio or a similar plugin is installed
on the test system.  However, a missing dependency can result
in the tests being skipped afterwards on the tinderbox.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2024-03-29 16:53 UTC
Newest commit scanned: 21da0f6
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/60ba31d17d/output.html

@gentoo-bot gentoo-bot closed this in 1f35acd Apr 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR.
Projects
None yet
5 participants