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

[20.03] python3Packages.cirq: fix test failures (ZHF) #85415

Merged
merged 2 commits into from Apr 21, 2020

Conversation

drewrisinger
Copy link
Contributor

Motivation for this change

Backport of #85412
Also build on aarch64 by disabling a few failing tests.

(cherry picked from commit 02a5282)

ZHF: #80379

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.

@drewrisinger
Copy link
Contributor Author

@GrahamcOfBorg build python37Packages.cirq python38Packages.cirq

@jonringer
Copy link
Contributor

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

@worldofpeace
Copy link
Contributor

I just did treewide mark as broken on 20.03 https://github.com/NixOS/nixpkgs/blob/release-20.03/pkgs/development/python-modules/cirq/default.nix, so you'll need to unmark it on 20.03

@worldofpeace worldofpeace mentioned this pull request Apr 17, 2020
10 tasks
Also build on aarch64 by disabling a few failing tests.

(cherry picked from commit 02a5282)
@drewrisinger
Copy link
Contributor Author

@worldofpeace ack, unmarked broken
@jonringer apologies, I thought it would get approved quick and was trying to rush through things at the end of the day Friday. Fixed up now.

@GrahamcOfBorg build python37Packages.cirq python38Packages.cirq

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build python38Packages.cirq

@FRidh FRidh merged commit e79d1e8 into NixOS:release-20.03 Apr 21, 2020
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

4 participants