From 9ed1939c703f9ce56bbfd375b6847428a3a44388 2022-08-15 13:55:46 From: Jarrod Millman Date: 2022-08-15 13:55:46 Subject: [PATCH] Rename master to main --- diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 03b58c6..8b1a4c3 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -2,9 +2,9 @@ name: Run MyPy on: push: - branches: [ master, 7.x] + branches: [ main, 7.x] pull_request: - branches: [ master, 7.x] + branches: [ main, 7.x] jobs: build: diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 663607f..37d0218 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -5,9 +5,9 @@ name: Python package on: push: - branches: [ master, 7.x ] + branches: [ main, 7.x ] pull_request: - branches: [ master, 7.x ] + branches: [ main, 7.x ] jobs: formatting: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1bbddbf..f57425a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - master - '*.x' pull_request: # Run weekly on Monday at 1:23 UTC diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 11321a4..5826baf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ When opening a new Issue, please take the following steps: 1. Search GitHub and/or Google for your issue to avoid duplicate reports. Keyword searches for your error messages are most helpful. -2. If possible, try updating to master and reproducing your issue, +2. If possible, try updating to main and reproducing your issue, because we may have already fixed it. 3. Try to include a minimal reproducible test case. 4. Include relevant system information. Start with the output of: @@ -53,7 +53,7 @@ Some guidelines on contributing to IPython: Review and discussion can begin well before the work is complete, and the more discussion the better. The worst case is that the PR is closed. -* Pull Requests should generally be made against master +* Pull Requests should generally be made against main * Pull Requests should be tested, if feasible: - bugfixes should include regression tests. - new behavior should at least get minimal exercise. diff --git a/IPython/__init__.py b/IPython/__init__.py index 7ebb80b..b5410f6 100644 --- a/IPython/__init__.py +++ b/IPython/__init__.py @@ -38,7 +38,7 @@ Python 3.7 was still supported with the 7.x branch. See IPython `README.rst` file for more information: - https://github.com/ipython/ipython/blob/master/README.rst + https://github.com/ipython/ipython/blob/main/README.rst """ ) diff --git a/README.rst b/README.rst index ec16031..5107eae 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -.. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=master - :target: https://codecov.io/github/ipython/ipython?branch=master +.. image:: https://codecov.io/github/ipython/ipython/coverage.svg?branch=main + :target: https://codecov.io/github/ipython/ipython?branch=main .. image:: https://img.shields.io/pypi/v/IPython.svg :target: https://pypi.python.org/pypi/ipython diff --git a/docs/source/coredev/index.rst b/docs/source/coredev/index.rst index ee1eadb..3ba9475 100644 --- a/docs/source/coredev/index.rst +++ b/docs/source/coredev/index.rst @@ -14,12 +14,12 @@ For instructions on how to make a developer install see :ref:`devinstall`. Backporting Pull requests ========================= -All pull requests should usually be made against ``master``, if a Pull Request +All pull requests should usually be made against ``main``, if a Pull Request need to be backported to an earlier release; then it should be tagged with the correct ``milestone``. If you tag a pull request with a milestone **before** merging the pull request, -and the base ref is ``master``, then our backport bot should automatically create +and the base ref is ``main``, then our backport bot should automatically create a corresponding pull-request that backport on the correct branch. If you have write access to the IPython repository you can also just mention the @@ -78,7 +78,7 @@ for the release you are actually making:: PREV_RELEASE=4.2.1 MILESTONE=5.0 VERSION=5.0.0 - BRANCH=master + BRANCH=main For `reproducibility of builds `_, we recommend setting ``SOURCE_DATE_EPOCH`` prior to running the build; record the used value diff --git a/examples/IPython Kernel/Terminal Usage.ipynb b/examples/IPython Kernel/Terminal Usage.ipynb index e6bd4c0..935bdd4 100644 --- a/examples/IPython Kernel/Terminal Usage.ipynb +++ b/examples/IPython Kernel/Terminal Usage.ipynb @@ -196,7 +196,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "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/master/examples/lib)." + "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)." ] }, { diff --git a/setup.py b/setup.py index 3c1dff9..bfdf5fb 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ Python 3.7 was still supported with the 7.x branch. See IPython `README.rst` file for more information: - https://github.com/ipython/ipython/blob/master/README.rst + https://github.com/ipython/ipython/blob/main/README.rst Python {py} detected. {pip} diff --git a/tools/github_stats.py b/tools/github_stats.py index f1a44fa..6a2f8f1 100644 --- a/tools/github_stats.py +++ b/tools/github_stats.py @@ -79,8 +79,8 @@ def issues_closed_since(period=timedelta(days=365), project="ipython/ipython", p filtered = [ i for i in allclosed if _parse_datetime(i['closed_at']) > since ] if pulls: filtered = [ i for i in filtered if _parse_datetime(i['merged_at']) > since ] - # filter out PRs not against master (backports) - filtered = [ i for i in filtered if i['base']['ref'] == 'master' ] + # filter out PRs not against main (backports) + filtered = [ i for i in filtered if i['base']['ref'] == 'main' ] else: filtered = [ i for i in filtered if not is_pull_request(i) ] diff --git a/tools/release_helper.sh b/tools/release_helper.sh index 54114d1..697ed85 100644 --- a/tools/release_helper.sh +++ b/tools/release_helper.sh @@ -31,7 +31,7 @@ MILESTONE=${input:-$MILESTONE} echo -n "VERSION (X.y.z) [$VERSION]:" read input VERSION=${input:-$VERSION} -echo -n "BRANCH (master|X.y) [$BRANCH]:" +echo -n "BRANCH (main|X.y) [$BRANCH]:" read input BRANCH=${input:-$BRANCH}