Show More
@@ -17,6 +17,33 b' For instruction on how to make a developer install see :ref:`devinstall`.' | |||||
17 | release_process |
|
17 | release_process | |
18 |
|
18 | |||
19 |
|
19 | |||
|
20 | Backporting Pull requests | |||
|
21 | ------------------------- | |||
|
22 | ||||
|
23 | All pull requests should usually be made against ``master``, if a Pull Request | |||
|
24 | need to be backported to an earlier release; then it should be tagged with the | |||
|
25 | correct ``milestone``. We then use `ghpro <https://pypi.python.org/pypi/ghpro>` | |||
|
26 | to automatically list and apply the PR on other branches. For example: | |||
|
27 | ||||
|
28 | .. code-block:: bash | |||
|
29 | ||||
|
30 | $ backport-pr todo --milestone 5.2 | |||
|
31 | [...snip..] | |||
|
32 | The following PRs have been backported | |||
|
33 | 9848 | |||
|
34 | 9851 | |||
|
35 | 9953 | |||
|
36 | 9955 | |||
|
37 | The following PRs should be backported: | |||
|
38 | 9417 | |||
|
39 | 9863 | |||
|
40 | 9925 | |||
|
41 | 9947 | |||
|
42 | ||||
|
43 | $ backport-pr apply 5.x 9947 | |||
|
44 | [...snip...] | |||
|
45 | ||||
|
46 | ||||
20 | Old Documentation |
|
47 | Old Documentation | |
21 | ================= |
|
48 | ================= | |
22 |
|
49 |
@@ -161,6 +161,10 b" def should_backport(labels=None, milestone=None, project='ipython/ipython'):" | |||||
161 |
|
161 | |||
162 | if __name__ == '__main__': |
|
162 | if __name__ == '__main__': | |
163 | project = 'ipython/ipython' |
|
163 | project = 'ipython/ipython' | |
|
164 | ||||
|
165 | print("DEPRECATE: backport_pr.py is deprecated and is is now recommended" | |||
|
166 | "to install `ghpro` from PyPI.", file=sys.stderr) | |||
|
167 | ||||
164 | args = list(sys.argv) |
|
168 | args = list(sys.argv) | |
165 | if len(args) >= 2: |
|
169 | if len(args) >= 2: | |
166 | if '/' in args[1]: |
|
170 | if '/' in args[1]: |
@@ -110,6 +110,10 b' def report(issues, show_urls=False):' | |||||
110 | #----------------------------------------------------------------------------- |
|
110 | #----------------------------------------------------------------------------- | |
111 |
|
111 | |||
112 | if __name__ == "__main__": |
|
112 | if __name__ == "__main__": | |
|
113 | ||||
|
114 | print("DEPRECATE: backport_pr.py is deprecated and is is now recommended" | |||
|
115 | "to install `ghpro` from PyPI.", file=sys.stderr) | |||
|
116 | ||||
113 | # deal with unicode |
|
117 | # deal with unicode | |
114 | if sys.version_info < (3,): |
|
118 | if sys.version_info < (3,): | |
115 | sys.stdout = codecs.getwriter('utf8')(sys.stdout) |
|
119 | sys.stdout = codecs.getwriter('utf8')(sys.stdout) |
General Comments 0
You need to be logged in to leave comments.
Login now