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.scikit-build: fix test bug on python3.8 #83526

Merged
merged 1 commit into from Mar 28, 2020

Conversation

drewrisinger
Copy link
Contributor

Motivation for this change

Closes #83305 , which causes hydra fail.

ZHF: #80379

QUESTION

Which branch should this target? master, staging, or 20.03?

I can also squash these two commits, just wanted to keep logically separate.

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". This didn't eval any packages when I ran it locally, will re-try when PR is posted. Tested build of this and pythonPackages.qiskit-aer (depends on this) locally, built fine.
  • 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

Results of nixpkgs-review pr 83526

https://github.com/NixOS/nixpkgs/pull/83526
1 package marked as broken and skipped:
python38Packages.qiskit-ibmq-provider

5 package built:
python27Packages.scikit-build python37Packages.qiskit-aer python37Packages.scikit-build python38Packages.qiskit-aer python38Packages.scikit-build

python38Packages.qiskit-ibmq-provider fails due to python38Packages.uvloop disabled on master #78343.

@drewrisinger
Copy link
Contributor Author

Thoughts on target branch?

@drewrisinger
Copy link
Contributor Author

@GrahamcOfBorg build python27Packages.scikit-build python37Packages.scikit-build python38Packages.scikit-build

@bhipple
Copy link
Contributor

bhipple commented Mar 27, 2020

Thoughts on target branch?

It should target master, as you've done here, and then once merged to master send a PR to release-20.03 that has run git cherry-pick -x <commit> for the commit(s) you'd like to backport (or ask a maintainer to do this step).

If the build were idiosyncratically broken on the 20.03 branch only, then it'd make sense to send just to 20.03; but in this case we have real fixes we'd like to get to master, and then backport afterwards.

If the PR change were going to cause hundreds of package rebuilds, we'd send it to staging, which batches the rebuild-the-world PRs together to avoid excessive binary churn on master.

@drewrisinger
Copy link
Contributor Author

@bhipple thanks for the detailed reply :)

@bhipple
Copy link
Contributor

bhipple commented Mar 27, 2020

You're welcome!

I can also squash these two commits, just wanted to keep logically separate.

Under most circumstances I'd agree, but since your patch is really just limited to the patches section, and the diff is still quite readable even all taken as 1 commit, and since we're about to cherry-pick it onto another branch, I'd say squash it in this case.

Python3.8 removes ``platform.linux_distribution()`` call,
must use ``pythonPackages.distro`` to get same information.
Closes NixOS#83305
Upstream PR: https://www.github.com/scikit-build/scikit-build/pull/458
Also formatting.
@bhipple
Copy link
Contributor

bhipple commented Mar 28, 2020

Great, thanks! Can you send the backport PR? Just run cherry-pick -x branched off of release-20.03, then send a PR with [20.03] in the title, like this one for example:

#83550

@bhipple bhipple merged commit ae6bdcc into NixOS:master Mar 28, 2020
@drewrisinger drewrisinger deleted the dr-pr-python-scikit-build-38 branch March 30, 2020 12:52
@drewrisinger
Copy link
Contributor Author

@bhipple #83774

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.

python38Packages.scikit-build: tests fail on python 3.8
3 participants