X Tutup
Skip to content

DOC: Fix entries in api section#7196

Merged
NelleV merged 2 commits intomatplotlib:v1.5.3-docfrom
QuLogic:fix-doc-api
Sep 30, 2016
Merged

DOC: Fix entries in api section#7196
NelleV merged 2 commits intomatplotlib:v1.5.3-docfrom
QuLogic:fix-doc-api

Conversation

@QuLogic
Copy link
Copy Markdown
Member

@QuLogic QuLogic commented Sep 29, 2016

Documentation was broken by the backport of #7145. I'm not really sure why there wasn't any problem on master, though. Fix that and also move the projections API into the api section as well.

@QuLogic QuLogic added this to the 2.0 (style change major release) milestone Sep 29, 2016
@QuLogic QuLogic changed the title Fix doc api DOC: Fix entries in api section Sep 29, 2016
@QuLogic
Copy link
Copy Markdown
Member Author

QuLogic commented Sep 29, 2016

Ping? I am going to merge this in a few hours because Travis is broken.

@NelleV
Copy link
Copy Markdown
Member

NelleV commented Sep 30, 2016

@QuLogic It is more efficient to ping someone personally than just adding a message. I for instance do not receive emails unless ping directly.

@NelleV NelleV merged commit 8d0388c into matplotlib:v1.5.3-doc Sep 30, 2016
@NelleV
Copy link
Copy Markdown
Member

NelleV commented Sep 30, 2016

@tacaswell This should probably also be backported to master

@QuLogic QuLogic deleted the fix-doc-api branch September 30, 2016 03:49
@QuLogic
Copy link
Copy Markdown
Member Author

QuLogic commented Sep 30, 2016

Everything not in master gets into it eventually after merging.

@tacaswell
Copy link
Copy Markdown
Member

I'll do the merge ups tonight

@NelleV
Copy link
Copy Markdown
Member

NelleV commented Sep 30, 2016

We could use projects to keep track of what need to be backported into which branch.

@QuLogic
Copy link
Copy Markdown
Member Author

QuLogic commented Sep 30, 2016

That's what milestones are for, and backports should be done at merge time so they aren't forgotten.

There's no need for commit-specific forward porting because branches are merged forward in their entirety every once in a while.

@tacaswell
Copy link
Copy Markdown
Member

The pattern we follow is 'old branches' (bug fix release + last releases doc branch) get merged up to master every so often (I just did 1.5.3-doc -> 2.x and then 2.x -> master). Only things going the other way need to be backported.

@NelleV
Copy link
Copy Markdown
Member

NelleV commented Sep 30, 2016

That's weird, but ok.

@NelleV
Copy link
Copy Markdown
Member

NelleV commented Sep 30, 2016

@QuLogic There are bunch of projects out there that manage just fine with one or two persons (release managers) doing backports. It is safer and less confusing.
I am fine doing backports myself, but it restricts the number of people who are able to merge certain PR to those who are comfortable enough with git to do so.

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.

4 participants

X Tutup