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.

Sign up for GitHub

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

Jump to bottom

[20.03]: python38Packages.uvloop: enable build #84224

Merged
merged 1 commit into from Apr 4, 2020
Merged

[20.03]: python38Packages.uvloop: enable build #84224

merged 1 commit into from Apr 4, 2020

Conversation

drewrisinger
Copy link
Contributor

Motivation for this change

Backport #84223 to 20.03 (see for details)

ZHF: #80379

Will enable once #84223 accepted to get most accurate commit.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from costrouc April 4, 2020 01:01
@bhipple
Copy link
Contributor

bhipple commented Apr 4, 2020

This doesn't appear to build yet, per nixpkgs-review. Perhaps there's something else that needs to be backported?

@drewrisinger
Copy link
Contributor Author

drewrisinger commented Apr 4, 2020 via email

@drewrisinger
Copy link
Contributor Author

I think the issue is #80595, and this can't find the source/tests dir due to pythonImportsCheckHook. Looking at the cwd in preCheck, in #84223 it's /build/source, in #84224 (against 20.03) it's $out.

Thoughts on if I should amend this PR (e.g. add postPatch="export SRC_DIR=$(pwd)" then in preCheck cp -r $SRC_DIR/tests $TMP_DIR)? Issue I see is that we'll have a conflict b/w master & release-20.03. Or could pull that #80595 into this branch (at risk of making other breaking changes).
@jonringer @NixOS/nixos-release-managers

@jonringer
Copy link
Contributor

oh yea, i didnt backport that because it could be a breaking change in a few cases.

This only really comes into play if there's compiled code.

Feel free to alter the commit so that it works on 20.03. No use in adding something that is unable to build.

Thanks for doing this!

@jonringer
Copy link
Contributor

also, backporting #80595 would cause a rebuild of everything that depends on python.

@jonringer
Copy link
Contributor

Thoughts on if I should amend this PR (e.g. add postPatch="export SRC_DIR=$(pwd)" then in preCheck cp -r $SRC_DIR/tests $TMP_DIR)?

all you need is:

  cp -r $sourceRoot/tests $TMP_DIR

assuming that $TMP_DIR is right, you may need to copy it to $out.

@drewrisinger
python3Packages.uvloop: enable on python3.8
6118f04 
Allow build pass by disabling test. Isolated issue to
test_sockets.py::TestAIOSockets::test_sock_close_add_reader_race.
This test is supposed to be skipped, but it isn't for some reason,
so we disable it instead.
See uvloop#284 (MagicStack/uvloop#284)
for full details. Don't know why this test isn't properly skipped.

(cherry picked from commit 364909d)
@drewrisinger
Copy link
Contributor Author

That builds properly.
Thanks for telling me about $sourceRoot, I didn't know that existed.

@drewrisinger drewrisinger marked this pull request as ready for review April 4, 2020 17:19
bhipple
bhipple approved these changes Apr 4, 2020
View reviewed changes
Copy link
Contributor

@bhipple bhipple left a comment

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 84224 1

25 packages failed to build: - datasette (python37Packages.datasette) - mtprotoproxy - python37Packages.aiorun - python37Packages.asyncpg - python37Packages.databases - python37Packages.entrance - python37Packages.entrance-with-router-features - python37Packages.fastapi - python37Packages.httpx - python37Packages.orm - python37Packages.sanic - python37Packages.sentry-sdk - python37Packages.starlette - python37Packages.uvicorn - python37Packages.uvloop - python38Packages.aiorun - python38Packages.asyncpg - python38Packages.databases - python38Packages.fastapi - python38Packages.httpx - python38Packages.orm - python38Packages.starlette - python38Packages.uvicorn - python38Packages.uvloop - sourcehut.listssrht

@bhipple bhipple merged commit 3cd9437 into NixOS:release-20.03 Apr 4, 2020
@drewrisinger drewrisinger deleted the dr-pr-backport-20.03-84223 branch April 6, 2020 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bhipple bhipple bhipple approved these changes

@costrouc costrouc Awaiting requested review from costrouc

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@drewrisinger @bhipple @jonringer