-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
DOC: change branch and backport guidelines #10822
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
DOC: change branch and backport guidelines #10822
Conversation
tacaswell
commented
Mar 17, 2018
- Documents that we now use meeseeksdev
- Documents current active branches
- Documents 2.2.x backport guidelines
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. |
There was a problem hiding this comment.
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?)
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
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 |
There was a problem hiding this comment.
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.
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+. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Python
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+ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Python
1d847ba
to
51277a0
Compare
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tutorials
There was a problem hiding this 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.
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. |