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

Whats new page for 3.1 #13856

Merged
merged 7 commits into from Apr 17, 2019
Merged

Whats new page for 3.1 #13856

merged 7 commits into from Apr 17, 2019

Conversation

story645
Copy link
Member

@story645 story645 commented Apr 2, 2019

PR Summary

Put all the what's new entries together into something hopefully vaguely resembling cohesion based on the directions here. Was a bit confused as documented in #13853

Also having trouble rendering the toc properly.
(ETA: I'll do the API changes compilation too if this one was mostly on target)

@story645 story645 added Documentation Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. labels Apr 2, 2019
@story645 story645 added this to the v3.1.0 milestone Apr 2, 2019
@story645 story645 marked this pull request as ready for review April 2, 2019 23:20
doc/users/whats_new.rst Outdated Show resolved Hide resolved
story645 and others added 4 commits April 15, 2019 22:42
 - adjust adornments
 - minor rewords / copy editing
 - make more things cross-refernecs
 - adopt Jody's wording on OSX non-framework
@tacaswell
Copy link
Member

@story645 Added some commits, rebased, and force-pushed.

@tacaswell
Copy link
Member

Want to tweak this to use include and ifconfig like the API changes PR did to take this simpler going forward, but very 💤 so stopping for the night.

@story645
Copy link
Member Author

@tacaswell the include ifconfig stuff is I think what I was confused about in #13853

@tacaswell
Copy link
Member

If I understand ifconfig correctly (and used it correctly), then when we tag and build the docs it should automatically exclude the glob tocs.

@tacaswell tacaswell merged commit 26e4f4a into matplotlib:master Apr 17, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Apr 17, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 26e4f4a25367232192a0c21a50635877ee2a3ac4
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #13856: Whats new page for 3.1 '
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-13856-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #13856 on branch v3.1.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

tacaswell added a commit that referenced this pull request Apr 18, 2019
DOC: Whats new page for 3.1

Conflicts:
	doc/users/next_whats_new/2019-01-06-shaded-voxels.rst
          - was deleted on both sides,
@tacaswell
Copy link
Member

backported and directly pushed in b1a6fba

@story645 story645 deleted the whats_new branch May 1, 2020 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants