Show More
@@ -2,9 +2,9 b' name: Run MyPy' | |||
|
2 | 2 | |
|
3 | 3 | on: |
|
4 | 4 | push: |
|
5 |
branches: [ ma |
|
|
5 | branches: [ main, 7.x] | |
|
6 | 6 | pull_request: |
|
7 |
branches: [ ma |
|
|
7 | branches: [ main, 7.x] | |
|
8 | 8 | |
|
9 | 9 | jobs: |
|
10 | 10 | build: |
@@ -5,9 +5,9 b' name: Python package' | |||
|
5 | 5 | |
|
6 | 6 | on: |
|
7 | 7 | push: |
|
8 |
branches: [ ma |
|
|
8 | branches: [ main, 7.x ] | |
|
9 | 9 | pull_request: |
|
10 |
branches: [ ma |
|
|
10 | branches: [ main, 7.x ] | |
|
11 | 11 | |
|
12 | 12 | jobs: |
|
13 | 13 | formatting: |
@@ -4,7 +4,6 b' on:' | |||
|
4 | 4 | push: |
|
5 | 5 | branches: |
|
6 | 6 | - main |
|
7 | - master | |
|
8 | 7 | - '*.x' |
|
9 | 8 | pull_request: |
|
10 | 9 | # Run weekly on Monday at 1:23 UTC |
@@ -33,7 +33,7 b' When opening a new Issue, please take the following steps:' | |||
|
33 | 33 | |
|
34 | 34 | 1. Search GitHub and/or Google for your issue to avoid duplicate reports. |
|
35 | 35 | Keyword searches for your error messages are most helpful. |
|
36 |
2. If possible, try updating to ma |
|
|
36 | 2. If possible, try updating to main and reproducing your issue, | |
|
37 | 37 | because we may have already fixed it. |
|
38 | 38 | 3. Try to include a minimal reproducible test case. |
|
39 | 39 | 4. Include relevant system information. Start with the output of: |
@@ -53,7 +53,7 b' Some guidelines on contributing to IPython:' | |||
|
53 | 53 | Review and discussion can begin well before the work is complete, |
|
54 | 54 | and the more discussion the better. |
|
55 | 55 | The worst case is that the PR is closed. |
|
56 |
* Pull Requests should generally be made against ma |
|
|
56 | * Pull Requests should generally be made against main | |
|
57 | 57 | * Pull Requests should be tested, if feasible: |
|
58 | 58 | - bugfixes should include regression tests. |
|
59 | 59 | - new behavior should at least get minimal exercise. |
@@ -38,7 +38,7 b' Python 3.7 was still supported with the 7.x branch.' | |||
|
38 | 38 | |
|
39 | 39 | See IPython `README.rst` file for more information: |
|
40 | 40 | |
|
41 |
https://github.com/ipython/ipython/blob/ma |
|
|
41 | https://github.com/ipython/ipython/blob/main/README.rst | |
|
42 | 42 | |
|
43 | 43 | """ |
|
44 | 44 | ) |
@@ -1,5 +1,5 b'' | |||
|
1 |
.. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=ma |
|
|
2 |
:target: https://codecov.io/github/ipython/ipython?branch=ma |
|
|
1 | .. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=main | |
|
2 | :target: https://codecov.io/github/ipython/ipython?branch=main | |
|
3 | 3 | |
|
4 | 4 | .. image:: https://img.shields.io/pypi/v/IPython.svg |
|
5 | 5 | :target: https://pypi.python.org/pypi/ipython |
@@ -14,12 +14,12 b' For instructions on how to make a developer install see :ref:`devinstall`.' | |||
|
14 | 14 | Backporting Pull requests |
|
15 | 15 | ========================= |
|
16 | 16 | |
|
17 |
All pull requests should usually be made against ``ma |
|
|
17 | All pull requests should usually be made against ``main``, if a Pull Request | |
|
18 | 18 | need to be backported to an earlier release; then it should be tagged with the |
|
19 | 19 | correct ``milestone``. |
|
20 | 20 | |
|
21 | 21 | If you tag a pull request with a milestone **before** merging the pull request, |
|
22 |
and the base ref is ``ma |
|
|
22 | and the base ref is ``main``, then our backport bot should automatically create | |
|
23 | 23 | a corresponding pull-request that backport on the correct branch. |
|
24 | 24 | |
|
25 | 25 | If you have write access to the IPython repository you can also just mention the |
@@ -78,7 +78,7 b' for the release you are actually making::' | |||
|
78 | 78 | PREV_RELEASE=4.2.1 |
|
79 | 79 | MILESTONE=5.0 |
|
80 | 80 | VERSION=5.0.0 |
|
81 |
BRANCH=ma |
|
|
81 | BRANCH=main | |
|
82 | 82 | |
|
83 | 83 | For `reproducibility of builds <https://reproducible-builds.org/specs/source-date-epoch/>`_, |
|
84 | 84 | we recommend setting ``SOURCE_DATE_EPOCH`` prior to running the build; record the used value |
@@ -196,7 +196,7 b'' | |||
|
196 | 196 | "cell_type": "markdown", |
|
197 | 197 | "metadata": {}, |
|
198 | 198 | "source": [ |
|
199 |
"The `%gui` magic can be similarly used to control Wx, Tk, glut and pyglet applications, [as can be seen in our examples](https://github.com/ipython/ipython/tree/ma |
|
|
199 | "The `%gui` magic can be similarly used to control Wx, Tk, glut and pyglet applications, [as can be seen in our examples](https://github.com/ipython/ipython/tree/main/examples/lib)." | |
|
200 | 200 | ] |
|
201 | 201 | }, |
|
202 | 202 | { |
@@ -48,7 +48,7 b' Python 3.7 was still supported with the 7.x branch.' | |||
|
48 | 48 | |
|
49 | 49 | See IPython `README.rst` file for more information: |
|
50 | 50 | |
|
51 |
https://github.com/ipython/ipython/blob/ma |
|
|
51 | https://github.com/ipython/ipython/blob/main/README.rst | |
|
52 | 52 | |
|
53 | 53 | Python {py} detected. |
|
54 | 54 | {pip} |
@@ -79,8 +79,8 b' def issues_closed_since(period=timedelta(days=365), project="ipython/ipython", p' | |||
|
79 | 79 | filtered = [ i for i in allclosed if _parse_datetime(i['closed_at']) > since ] |
|
80 | 80 | if pulls: |
|
81 | 81 | filtered = [ i for i in filtered if _parse_datetime(i['merged_at']) > since ] |
|
82 |
# filter out PRs not against ma |
|
|
83 |
filtered = [ i for i in filtered if i['base']['ref'] == 'ma |
|
|
82 | # filter out PRs not against main (backports) | |
|
83 | filtered = [ i for i in filtered if i['base']['ref'] == 'main' ] | |
|
84 | 84 | else: |
|
85 | 85 | filtered = [ i for i in filtered if not is_pull_request(i) ] |
|
86 | 86 |
General Comments 0
You need to be logged in to leave comments.
Login now