Skip to content

python39Packages.pycurl: disable failing tests, add SuperSandro2000 as maintainer#168154

Merged
vcunat merged 1 commit intoNixOS:masterfrom
das-g:pycurl-workaround-to-fix-build
Apr 10, 2022
Merged

python39Packages.pycurl: disable failing tests, add SuperSandro2000 as maintainer#168154
vcunat merged 1 commit intoNixOS:masterfrom
das-g:pycurl-workaround-to-fix-build

Conversation

@das-g
Copy link
Member

@das-g das-g commented Apr 10, 2022

(cherry picked from commit c270def)

Description of changes

cherry-pick #166335 to master to workaround #167971 until #167993 hits master from stagin / staging-next. As discussed in #167993 (comment), this causes many "re"builds, but only those that are currently (transitively) failing to build on master due to the pycurl build problem, anyway. Thus it should be OK to target master.

This will be partially reverted by 32f4270 (i.e., the now-failing tests will be re-enabled), which will get introduced from stagin / staging-next to master together with the fix-proper from #167993 that shall make those tests pass again.

Things done

  • Built on platform(s)

    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin

  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)

  • Tested, as applicable:

  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage

    Result of nixpkgs-review run on x86_64-linux 1

    1 package marked as broken and skipped:
    • python310Packages.bugwarrior
    1 package failed to build:
    • udocker
    15 packages built:
    • moonraker
    • nvchecker (python39Packages.nvchecker)
    • nvfetcher
    • pyCA
    • python310Packages.nvchecker
    • python310Packages.osc
    • python310Packages.pycurl
    • python310Packages.urlgrabber
    • python310Packages.wfuzz
    • python39Packages.bugwarrior
    • python39Packages.osc
    • python39Packages.pycurl
    • python39Packages.urlgrabber
    • wfuzz (python39Packages.wfuzz)
    • system-config-printer

  • Tested basic functionality of all binary files (usually in ./result/bin/)

    • The only executable binary from above seems to be moonraker. I have no idea how to test that. If I launch it without arguments, it fails with FileNotFoundError: [Errno 2] No such file or directory: '/home/das-g/moonraker.conf' but that's hardly to be blamed on pycurl.

  • 22.05 Release Notes (or backporting 21.11 Release notes)

    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes

  • Fits CONTRIBUTING.md.

@das-g das-g requested review from FRidh and jonringer as code owners April 10, 2022 16:18
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Apr 10, 2022
@das-g das-g mentioned this pull request Apr 10, 2022
Merged
13 tasks
@das-g das-g requested a review from vcunat April 10, 2022 16:22
@ofborg ofborg bot requested a review from SuperSandro2000 April 10, 2022 16:48
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 10, 2022
@vcunat vcunat merged commit e62954b into NixOS:master Apr 10, 2022
vcunat added a commit that referenced this pull request Apr 10, 2022
@vcunat
Revert "python39Packages.pycurl: disable failing tests"
f44598b 
This partially reverts commit 7f8c513 from PR #168154,
and it's also the same as commit 32f4270.
The tests worked after curl fix (commit 0fad2b3 from PR #167993).
@vcunat
Copy link
Member

vcunat commented Apr 10, 2022

We got the history a bit messy, with this commit merged in two copies and also reverted twice, but hopefully people won't get tangled in that during bisection or something.

@das-g das-g deleted the pycurl-workaround-to-fix-build branch April 10, 2022 21:44
@das-g
Copy link
Member Author

das-g commented Apr 10, 2022

We got the history a bit messy, with this commit merged in two copies

That's why I would prefer "daggy" fixes. With them, the same fix commit could be merged into all affected branches without cherry-picking or rebasing. But AFAIK they're against nixpkgs policy or at least against common nixpkgs practice.

and also reverted twice

Unless I'm unaware of something, 32f4270 is and will be the only (partial) revert regarding this. Unless the branches are being merged in an unexpected order, this should be fine and this one revert will undo the test deactivation from both copies of the workaround.

but hopefully people won't get tangled in that during bisection or something.

I hope it will even facilitate bisection, as more packages will now be buildable in revisions in which they otherwise wouldn't have been buildable.

@vcunat
Copy link
Member

vcunat commented Apr 11, 2022

I tried to merge the same commit twice, but in this case (and many others) it already contained other commits in history that I didn't want to include yet. I don't think it was really against policy. (Example: 5e71a3f was a re-merge of 040d892.)

This is the other revert: f44598b.

ttuegel pushed a commit to ttuegel/nixpkgs that referenced this pull request Apr 11, 2022
@vcunat @ttuegel
Merge NixOS#168154: python39Packages.pycurl: disable failing tests
7ce8de0 
(cherry picked from commit e62954b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@vcunat vcunat Awaiting requested review from vcunat

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@das-g @vcunat @SuperSandro2000