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.

Sign up for GitHub

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

Jump to bottom

python3.pkgs.rpy2: 2.9.5 -> 3.2.2 #74537

Merged
merged 1 commit into from Nov 30, 2019
Merged

python3.pkgs.rpy2: 2.9.5 -> 3.2.2 #74537

merged 1 commit into from Nov 30, 2019

Conversation

timokau
Copy link
Member

@timokau timokau commented Nov 28, 2019

Motivation for this change

There have been significant changes, therefore it doesn't make sense
anymore to maintain the python2 and python3 version in the same file.
We'll be able to drop the python2 version soon, some time after we have
switched sage to 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 nix-review --run "nix-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.
Notify maintainers

cc @

@ofborg ofborg bot requested a review from joelmo November 28, 2019 22:16
@jonringer
Copy link
Contributor

I would to split out the changes into 2 commits:

python2Packages.rpy2: freeze at 2.9.5
python3Packages.rpy2: 2.9.5 -> 3.2.2

@timokau
Copy link
Member Author

timokau commented Nov 29, 2019

But python2 rpy2 was already frozen at 2.8.6. The only difference is that previously, both versions were maintained in the same file because 2.9.x (the py3 version) was similar enough.

jonringer
jonringer reviewed Nov 30, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

this does seem to cause a regression with sage:

builder for '/nix/store/ss4rkx5p5aciz5nidlrzr088y00951br-sage-tests-8.9.drv' failed with exit code 1; last 10 log lines:
  sage -t --long /nix/store/62xwy4d6055qshylxl7n63idga66d96b-sage-src-8.9/src/sage/schemes/elliptic_curves/ell_rational_field.py
      [847 tests, 132.16 s]
  sage -t --long /nix/store/62xwy4d6055qshylxl7n63idga66d96b-sage-src-8.9/src/sage/rings/function_field/function_field.py
      [750 tests, 211.04 s]
  ----------------------------------------------------------------------
  sage -t --long /nix/store/62xwy4d6055qshylxl7n63idga66d96b-sage-src-8.9/src/sage/matrix/matrix_space.py  # 1 doctest failed
  ----------------------------------------------------------------------
  Total time for all tests: 652.0 seconds
      cpu time: 10508.3 seconds
      cumulative wall time: 13614.3 seconds
cannot build derivation '/nix/store/4i6b3xy9yh0frl6zakibjm83wxz7l2iz-sage-8.9.drv': 1 dependencies couldn't be built

@timokau
Copy link
Member Author

timokau commented Nov 30, 2019

@jonringer I cannot reproduce that. Neither on this branch, nor on master. This PR really shouldn't change anything for sage, since sage uses the py2 version which is still pinned on the same version.

The full log would be interesting. Is the failure reproducible for you?

@timokau
Copy link
Member Author

timokau commented Nov 30, 2019

You can run just that one test like this:

nix-build -E 'with (import ./. {}); sage.tests.override { files = [ "src/sage/matrix/matrix_space.py" ];}'

@jonringer
Copy link
Contributor

I was also running a few other reviews, and it looks like it failed on a performance test. Could have been starved for cpu resources.

If you feel confident it will pass on hydra, then I'm fine with it

@timokau
python3.pkgs.rpy2: 2.9.5 -> 3.2.2
ef43cd3 
There have been significant changes, therefore it doesn't make sense
anymore to maintain the python2 and python3 version in the same file.
We'll be able to drop the python2 version soon, some time after we have
switched sage to python3.
@timokau timokau merged commit 28cb34d into NixOS:master Nov 30, 2019
@timokau timokau deleted the rpy2-3.2.2 branch November 30, 2019 23:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@Mic92 Mic92 Mic92 approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@joelmo joelmo Awaiting requested review from joelmo

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@timokau @jonringer @Mic92