Show More
@@ -19,18 +19,17 b' need to be backported to an earlier release; then it should be tagged with the' | |||||
19 | correct ``milestone``. |
|
19 | correct ``milestone``. | |
20 |
|
20 | |||
21 | If you tag a pull request with a milestone **before** merging the pull request, |
|
21 | If you tag a pull request with a milestone **before** merging the pull request, | |
22 | and the base ref is `master`, then our backport bot should automatically create |
|
22 | and the base ref is ``master``, then our backport bot should automatically create | |
23 | a corresponding pull-request that backport on the correct branch. |
|
23 | a corresponding pull-request that backport on the correct branch. | |
24 |
|
24 | |||
25 |
If you |
|
25 | If you have write access to the IPython repository you can also just mention the | |
26 | **backport bot** to do the work for you. The bot is evolving so instructions may |
|
26 | **backport bot** to do the work for you. The bot is evolving so instructions may | |
27 | be different. At the time of this writing you can use:: |
|
27 | be different. At the time of this writing you can use:: | |
28 |
|
28 | |||
29 |
@meeseeksdev[bot] backport [to <branchname> |
|
29 | @meeseeksdev[bot] backport [to] <branchname> | |
30 |
|
30 | |||
31 | The bot will attempt to backport the current pull-request and issue a PR if |
|
31 | The bot will attempt to backport the current pull-request and issue a PR if | |
32 | possible. If the milestone is set on the issue you can omit the branch to |
|
32 | possible. | |
33 | backport to. |
|
|||
34 |
|
33 | |||
35 | .. note:: |
|
34 | .. note:: | |
36 |
|
35 | |||
@@ -149,8 +148,10 b' If a major release:' | |||||
149 | - Edit ``docs/source/whatsnew/index.rst`` to list the new ``github-stats-X`` |
|
148 | - Edit ``docs/source/whatsnew/index.rst`` to list the new ``github-stats-X`` | |
150 | file you just created. |
|
149 | file you just created. | |
151 |
|
150 | |||
152 | - Remove temporarily the first entry called ``development`` (you'll need to |
|
151 | - You do not need to temporarily remove the first entry called | |
153 | add it back after release). |
|
152 | ``development``, nor re-add it after the release, it will automatically be | |
|
153 | hidden when releasing a stable version of IPython (if ``_version_extra`` | |||
|
154 | in ``release.py`` is an empty string. | |||
154 |
|
155 | |||
155 | Make sure that the stats file has a header or it won't be rendered in |
|
156 | Make sure that the stats file has a header or it won't be rendered in | |
156 | the final documentation. |
|
157 | the final documentation. |
@@ -12,6 +12,23 b'' | |||||
12 | What's new in IPython |
|
12 | What's new in IPython | |
13 | ===================== |
|
13 | ===================== | |
14 |
|
14 | |||
|
15 | .. this will appear in the docs if we are nto releasing a versin (ie is | |||
|
16 | .. _version_extra in release.py is empty stringA | |||
|
17 | ||||
|
18 | .. only:: ipydev | |||
|
19 | ||||
|
20 | Developpement version in-progress features: | |||
|
21 | ||||
|
22 | .. toctree:: | |||
|
23 | development | |||
|
24 | ||||
|
25 | .. this make a hidden toctree that avoid sphinx to complain about documents | |||
|
26 | .. included nowhere when building docs for stable | |||
|
27 | .. only:: ipystable | |||
|
28 | .. toctree:: | |||
|
29 | :hidden: | |||
|
30 | development | |||
|
31 | ||||
15 | This section documents the changes that have been made in various versions of |
|
32 | This section documents the changes that have been made in various versions of | |
16 | IPython. Users should consult these pages to learn about new features, bug |
|
33 | IPython. Users should consult these pages to learn about new features, bug | |
17 | fixes and backwards incompatibilities. Developers should summarize the |
|
34 | fixes and backwards incompatibilities. Developers should summarize the | |
@@ -20,7 +37,6 b' development work they do here in a user friendly format.' | |||||
20 | .. toctree:: |
|
37 | .. toctree:: | |
21 | :maxdepth: 1 |
|
38 | :maxdepth: 1 | |
22 |
|
39 | |||
23 | development |
|
|||
24 | version7 |
|
40 | version7 | |
25 | version6 |
|
41 | version6 | |
26 | github-stats-6 |
|
42 | github-stats-6 |
@@ -22,7 +22,7 b' on the bugfix only 5.x branch, but we remind you that Python 2 EOL is Jan 1st' | |||||
22 |
|
22 | |||
23 | We were able to backport bug fixes to the 5.x branch thanks to our backport bot which |
|
23 | We were able to backport bug fixes to the 5.x branch thanks to our backport bot which | |
24 | backported more than `70 Pull-Requests |
|
24 | backported more than `70 Pull-Requests | |
25 | <https://github.com/ipython/ipython/pulls?page=3&q=is%3Apr+sort%3Aupdated-desc+author%3Aapp%2Fmeeseeksdev++5.x&utf8=%E2%9C%93>`_, but there are still many PRs that required manually work, and this is an area of the project were you can easily contribute by looking for `PRs still needed backport<https://github.com/ipython/ipython/issues?q=label%3A%22Still+Needs+Manual+Backport%22+is%3Aclosed+sort%3Aupdated-desc>`_ |
|
25 | <https://github.com/ipython/ipython/pulls?page=3&q=is%3Apr+sort%3Aupdated-desc+author%3Aapp%2Fmeeseeksdev++5.x&utf8=%E2%9C%93>`_, but there are still many PRs that required manually work, and this is an area of the project were you can easily contribute by looking for `PRs still needed backport <https://github.com/ipython/ipython/issues?q=label%3A%22Still+Needs+Manual+Backport%22+is%3Aclosed+sort%3Aupdated-desc>`_ | |
26 |
|
26 | |||
27 | IPython 6.x branch will likely not see any further release unless we critical |
|
27 | IPython 6.x branch will likely not see any further release unless we critical | |
28 | bugs are found. |
|
28 | bugs are found. | |
@@ -166,6 +166,7 b' This new feature helps dual environment development - Jupyter+IDE - where the co' | |||||
166 | first = MyClass(5) |
|
166 | first = MyClass(5) | |
167 |
|
167 | |||
168 | .. code:: |
|
168 | .. code:: | |
|
169 | ||||
169 | # mymodule/file1.py |
|
170 | # mymodule/file1.py | |
170 |
|
171 | |||
171 | class MyClass: |
|
172 | class MyClass: |
General Comments 0
You need to be logged in to leave comments.
Login now