Skip to content

DOC: change branch and backport guidelines#10822

Merged
tacaswell merged 5 commits intomatplotlib:v2.2.2-docfrom
tacaswell:doc_branchbackport
Mar 19, 2018
Merged

DOC: change branch and backport guidelines#10822
tacaswell merged 5 commits intomatplotlib:v2.2.2-docfrom
tacaswell:doc_branchbackport

Conversation

@tacaswell
Copy link
Copy Markdown
Member

  • Documents that we now use meeseeksdev
  • Documents current active branches
  • Documents 2.2.x backport guidelines

@tacaswell tacaswell added this to the v2.2-doc milestone Mar 17, 2018
Comment thread doc/devel/coding_guide.rst Outdated
TARGETBRANCH`` in the milestone description.

The bot can also be manually triggered after a merge by leaving a
message ``@meeseeksdev backport to BRANCH`` on the PR.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

note that only whitelisted devs can use that (and mention how to be added?) (or did that change?)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

There is no longer a whitelist.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can you document what to do when meeseeksdev replies with the cryptic error message "Something went wrong ... Please have a look at my logs." Are the logs somewhere visible?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I think Mathias has to add you to another service to have access to the logs.

Comment thread doc/devel/coding_guide.rst Outdated

* ``DANGER`` is a read/write remote branch of the matplotlib/matplotlib repo
We use meeseeksdev bot to automatically backport merges to the correct
maintenance branch based on the milestone assigned to the PR. The
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Milestone should be assigned before merging.

Comment thread doc/devel/coding_guide.rst Outdated

We do a backport from master to v2.0.x assuming:
*master*
This will be Matplotlib 3.0. Supports python 3.5+.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Python

Comment thread doc/devel/coding_guide.rst Outdated

* ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo
*v2.2.x*
Maintenance branch for Matplotlib 2.2 LTS. Supports python 2.7, 3.4+
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Python

@tacaswell tacaswell force-pushed the doc_branchbackport branch from 1d847ba to 51277a0 Compare March 18, 2018 19:47
Comment thread doc/devel/coding_guide.rst Outdated
for and shepherd through the backport.

The only changes to be backported to 2.2.N-doc are changes to
:path:`doc`, :path:`examples`, or :path:`totorials`. Any changes to
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

tutorials

Copy link
Copy Markdown
Contributor

@dopplershift dopplershift left a comment

Choose a reason for hiding this comment

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

Sounds good, once sphinx build passes.

@tacaswell tacaswell merged commit 6dc0c02 into matplotlib:v2.2.2-doc Mar 19, 2018
@tacaswell tacaswell deleted the doc_branchbackport branch March 19, 2018 22:27
@tacaswell
Copy link
Copy Markdown
Member Author

self-merged on @dopplershift 's approval and discussion on the call today so it will be in the 2.2.2 docs which I am building now.

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.

6 participants