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

pythonPackages.entrypoints: fix python2 build #49458

Merged
merged 1 commit into from Oct 30, 2018

Conversation

timokau
Copy link
Member

@timokau timokau commented Oct 30, 2018

Motivation for this change

The recent pytest upgrade in bea4b36
broke the test suite.

Originally part of #49446, but since it seems like that'll take a while its probably better to push this fix now.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

The recent pytest upgrade in bea4b36
broke the test suite.
@FRidh
Copy link
Member

FRidh commented Oct 30, 2018

@timokau python-unstable branch isn't a continuously used branch and often force pushed to as well. If you have a large rebuild, it should target staging instead.

# path. The pytest upgrade added some warning, resulting in two warnings
# being thrown.
# upstream: https://github.com/takluyver/entrypoints/issues/23
pyTestArgs = if isPy27 then "-k 'not test_bad'" else "";
Copy link
Member

Choose a reason for hiding this comment

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

pyTestArgs is not a valid argument for buildPythonPackage. Use a let expression instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

You're right, that should've been a let expression. I merged a bit too quick. The way it is now should just add a pyTestArgs environment variable though, or does buildPythonPackage handle this different from mkDerivation? Do you want me to make a new PR to use let instead?

@timokau
Copy link
Member Author

timokau commented Oct 30, 2018

I didn't target python-unstable because of a large rebuild but because the issue was introduced in python-unstable (by the pytest upgrade, current head of python-unstable).

@timokau
Copy link
Member Author

timokau commented Oct 30, 2018

And I originally noticed the regression on python-unstable because I based #49446 on python-unstable because it relies on the cython upgrade. By the time it is unblocked (when mesa is upgraded) that'll probably be in master though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants