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

sage: 8.3 -> 8.4 #44527

Merged
merged 17 commits into from
Oct 19, 2018
Merged

sage: 8.3 -> 8.4 #44527

merged 17 commits into from
Oct 19, 2018

Conversation

timokau
Copy link
Member

@timokau timokau commented Aug 6, 2018

Motivation for this change

There ain't no rest for the wicked, sage updates don't grow on trees...

Shortly after the 8.3 update, the first 8.4 beta is already released.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Aug 6, 2018
@pSub pSub added the 2.status: work-in-progress This PR isn't done label Aug 6, 2018
@7c6f434c
Copy link
Member

7c6f434c commented Sep 7, 2018

I got a GitHub notification that you (@timokau) have pushed 0 commits. Was it a rebase?

@timokau
Copy link
Member Author

timokau commented Sep 7, 2018

I actually did push some commits (updating to beta3, merging master, cherry-picking the openblas fix from staging, updating to beta4). I did rebase but only locally with stuff I didn't push yet (no force-push). I don't know what confused github. I usually don't get any notifications at all if a PR gets updated by force-push.

@7c6f434c
Copy link
Member

So, a release has happenned?

@timokau
Copy link
Member Author

timokau commented Oct 19, 2018

Yes, I just got a bit sick and thus didn't do a final review & merge yet. Do you think the changes should be squashed? Thats how I did it the previous release but preserving the in-between releases might not hurt either when bisecting some issue.

@7c6f434c
Copy link
Member

No idea re:squashing, given that most intermediate commits are plain bumps… I guess it is you who would bisect Sage RCs anyway

@timokau
Copy link
Member Author

timokau commented Oct 19, 2018

The RCs yes, but the betas usually also remove some patches that were included upstream or something. I think preserving that history might be valuable, but it would also "pollute" commit history a bit.

@7c6f434c
Copy link
Member

Given that every commit is a working state, I guess it is not making anything worse compared to the status quo (we will have a lot of merged small branches until the entire model of interaction with the non-committer contributors is different).

So please do not underestimate the importance of your convenience in maintaining Sage.

(Personally, I do value keeping the true history of changes; I also find use of Git usually suboptimal for that goal)

@timokau
Copy link
Member Author

timokau commented Oct 19, 2018

Personally, I do value keeping the true history of changes; I also find use of Git usually suboptimal for that goal

I agree. Thanks for your opinion :)

All but two of the nix specific patches are upstreamed now 🎉

@timokau timokau merged commit a413ded into NixOS:master Oct 19, 2018
@timokau timokau changed the title [WIP] sage: 8.3 -> 8.4 sage: 8.3 -> 8.4 Oct 19, 2018
@timokau
Copy link
Member Author

timokau commented Oct 19, 2018

Oops should've removed the WIP label first.

@timokau timokau deleted the sage-8.4 branch October 20, 2018 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants