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.yq: Fix tests #100717

Merged
merged 1 commit into from Nov 14, 2020
Merged

pythonPackages.yq: Fix tests #100717

merged 1 commit into from Nov 14, 2020

Conversation

@veehaitch
Copy link
Member

@veehaitch veehaitch commented Oct 16, 2020

Revert commit 40a58cc introduced in #98282.

Motivation for this change

The reverted commit introduced two problems, as far as I can tell:

  1. The test test/test.py::TestYq::test_yq_arg_handling fails on NixOS using latest nixpkgs master
  2. The BSD script(1) doesn't have the -c option causing this to fail on macOS

Maybe this isn't the perfect way to address the issue but by reverting this commit, macOS and NixOS build the package just fine.

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.
@veehaitch veehaitch requested review from FRidh and jonringer as code owners Oct 16, 2020
@ofborg ofborg bot requested a review from womfoo Oct 16, 2020
@marsam marsam linked an issue that may be closed by this pull request Nov 14, 2020
@marsam marsam merged commit 6502a67 into NixOS:master Nov 14, 2020
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants