Show More
@@ -9,7 +9,7 b' developers of third party tools and libraries that use IPython should see the' | |||||
9 | :doc:`../development/index`. |
|
9 | :doc:`../development/index`. | |
10 |
|
10 | |||
11 |
|
11 | |||
12 | For instruction on how to make a developer install see :ref:`devinstall`. |
|
12 | For instructions on how to make a developer install see :ref:`devinstall`. | |
13 |
|
13 | |||
14 | .. toctree:: |
|
14 | .. toctree:: | |
15 | :maxdepth: 1 |
|
15 | :maxdepth: 1 | |
@@ -22,7 +22,27 b' Backporting Pull requests' | |||||
22 |
|
22 | |||
23 | All pull requests should usually be made against ``master``, if a Pull Request |
|
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 |
|
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>` |
|
25 | correct ``milestone``. | |
|
26 | ||||
|
27 | If you are an admin on the IPython repository just mention the **backport bot** to | |||
|
28 | do the work for you. The bot is evolving so instructions may be different. At | |||
|
29 | the time of this writing you can use:: | |||
|
30 | ||||
|
31 | @meeseeksdev[bot] backport to <branchname> | |||
|
32 | ||||
|
33 | The bot will attempt to backport the current pull-request and issue a PR if | |||
|
34 | possible. | |||
|
35 | ||||
|
36 | .. note:: | |||
|
37 | ||||
|
38 | The ``@`` and ``[dev]`` when mentioning the bot should be optional and can | |||
|
39 | be omitted. | |||
|
40 | ||||
|
41 | ||||
|
42 | Backport with ghpro | |||
|
43 | ------------------- | |||
|
44 | ||||
|
45 | We can also use `ghpro <https://pypi.python.org/pypi/ghpro>` | |||
26 | to automatically list and apply the PR on other branches. For example: |
|
46 | to automatically list and apply the PR on other branches. For example: | |
27 |
|
47 | |||
28 | .. code-block:: bash |
|
48 | .. code-block:: bash |
@@ -87,6 +87,9 b' To find duplicates and update `.mailmap`, use::' | |||||
87 |
|
87 | |||
88 | git log --format="%aN <%aE>" $PREV_RELEASE... | sort -u -f |
|
88 | git log --format="%aN <%aE>" $PREV_RELEASE... | sort -u -f | |
89 |
|
89 | |||
|
90 | If a minor release you might need to do some of the above points manually, and | |||
|
91 | forward port the changes. | |||
|
92 | ||||
90 | 3. Make sure the repository is clean |
|
93 | 3. Make sure the repository is clean | |
91 | ------------------------------------ |
|
94 | ------------------------------------ | |
92 |
|
95 | |||
@@ -243,8 +246,12 b' The IPython website should document the new release:' | |||||
243 | Make sure to update readthedocs and set the latest tag as stable, as well as |
|
246 | Make sure to update readthedocs and set the latest tag as stable, as well as | |
244 | checking that previous release is still building under its own tag. |
|
247 | checking that previous release is still building under its own tag. | |
245 |
|
248 | |||
|
249 | 13. Update the Conda-Forge feedstock | |||
|
250 | ------------------------------------ | |||
|
251 | ||||
|
252 | Follow the instructions on `the repository <https://github.com/conda-forge/ipython-feedstock>`_ | |||
246 |
|
253 | |||
247 |
1 |
|
254 | 14. Celebrate! | |
248 | -------------- |
|
255 | -------------- | |
249 |
|
256 | |||
250 | Celebrate the release and please thank the contributors for their work. Great |
|
257 | Celebrate the release and please thank the contributors for their work. Great |
General Comments 0
You need to be logged in to leave comments.
Login now