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

yoda: provide python3Packages.yoda #77642

Merged
merged 1 commit into from Jan 31, 2020
Merged

Conversation

@veprbl
Copy link
Member

@veprbl veprbl commented Jan 13, 2020

Motivation for this change

To provide yoda bindings for use with python3

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.
@veprbl veprbl requested review from FRidh and jonringer as code owners Jan 13, 2020
@@ -24497,7 +24497,9 @@ in

thepeg = callPackage ../development/libraries/physics/thepeg { };

yoda = callPackage ../development/libraries/physics/yoda { };
yoda = callPackage ../development/libraries/physics/yoda {
pythonPackages = python2Packages;

This comment has been minimized.

@jonringer

jonringer Jan 15, 2020
Contributor

python2 is EOL, please use python3Packages if possible

This comment has been minimized.

@jonringer

jonringer Jan 15, 2020
Contributor

using my other suggestions:

Suggested change
pythonPackages = python2Packages;
python = python3;

This comment has been minimized.

@veprbl

veprbl Jan 15, 2020
Author Member

I will be switching yoda to use python3 by default, but that, probably, can not be done until I get rivet version 3 working.

pkgs/development/libraries/physics/yoda/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/physics/yoda/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/physics/yoda/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/python-packages.nix Outdated Show resolved Hide resolved
@veprbl veprbl force-pushed the veprbl:pr/yoda_to_pythonpackages branch from a0746a9 to 74fe916 Jan 15, 2020
@veprbl veprbl force-pushed the veprbl:pr/yoda_to_pythonpackages branch from 74fe916 to db4210c Jan 15, 2020
@veprbl
Copy link
Member Author

@veprbl veprbl commented Jan 15, 2020

@GrahamcOfBorg build python2Packages.yoda python3Packages.yoda

@jonringer jonringer requested a review from FRidh Jan 16, 2020
Copy link
Contributor

@jonringer jonringer left a comment

diff looks better to me (improvement, would still like to see python3 eventually)
commit LGTM

https://github.com/NixOS/nixpkgs/pull/77642
10 package built:
fastnlo herwig mcgrid rivet yoda python37Packages.yoda python38Packages.yoda sherpa thepeg yoda-with-root
@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 16, 2020

@GrahamcOfBorg build fastnlo herwig mcgrid rivet yoda python37Packages.yoda python38Packages.yoda sherpa thepeg yoda-with-root

@veprbl
Copy link
Member Author

@veprbl veprbl commented Jan 31, 2020

Let's merge this unless there are objections.

@jonringer jonringer merged commit dc57bd8 into NixOS:master Jan 31, 2020
22 checks passed
22 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
fastnlo, herwig, mcgrid, python37Packages.yoda, python38Packages.yoda, rivet, sherpa, thepeg, yoda, yoda-with-root on aarch64-linux Success
Details
fastnlo, herwig, mcgrid, python37Packages.yoda, python38Packages.yoda, rivet, sherpa, thepeg, yoda, yoda-with-root on x86_64-darwin Success
Details
fastnlo, herwig, mcgrid, python37Packages.yoda, python38Packages.yoda, rivet, sherpa, thepeg, yoda, yoda-with-root on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
python2Packages.yoda, python3Packages.yoda on aarch64-linux Success
Details
python2Packages.yoda, python3Packages.yoda on x86_64-darwin Success
Details
python2Packages.yoda, python3Packages.yoda on x86_64-linux Success
Details
yoda on aarch64-linux Success
Details
yoda on x86_64-darwin Success
Details
yoda on x86_64-linux Success
Details
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.

None yet

3 participants
You can’t perform that action at this time.