Skip to content

Commit 53c603c

Browse files
committed
Cleanup references to master branch
1 parent 86dc194 commit 53c603c

16 files changed

+22
-22
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<!--
66
Checklist:
7-
- Read the [Contributing Guidelines](https://github.com/python/mypy/blob/master/CONTRIBUTING.md)
7+
- Read the [Contributing Guidelines](https://github.com/python/mypy/blob/main/CONTRIBUTING.md)
88
- Add tests for all changed behaviour.
99
- If you can't add a test, please explain why and how you verified your changes work.
1010
- Make sure CI passes.

.github/workflows/build_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Trigger wheel build
22

33
on:
44
push:
5-
branches: [main, master, 'release*']
5+
branches: [main, 'release*']
66
tags: ['*']
77

88
jobs:

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Check documentation build
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [main, master, 'release*']
6+
branches: [main, 'release*']
77
tags: ['*']
88
pull_request:
99
paths:

.github/workflows/mypy_primer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Run mypy_primer
22

33
on:
4-
# Only run on PR, since we diff against master
4+
# Only run on PR, since we diff against main
55
pull_request:
66
paths-ignore:
77
- 'docs/**'

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Tests
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [main, master, 'release*']
6+
branches: [main, 'release*']
77
tags: ['*']
88
pull_request:
99
paths-ignore:

.github/workflows/test_stubgenc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Test stubgenc on pybind11-mypy-demo
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [main, master, 'release*']
6+
branches: [main, 'release*']
77
tags: ['*']
88
pull_request:
99
paths:

CREDITS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Credits
22
-------
33

44
For a full list of contributors you can mine the commit history:
5-
https://github.com/python/mypy/commits/master
5+
https://github.com/python/mypy/commits/main
66

77
For lists of contributors per mypy release (including typeshed) see
88
the release blog posts at https://mypy-lang.blogspot.com/.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ repo directly:
102102
```bash
103103
python3 -m pip install -U git+https://github.com/python/mypy.git
104104
# or if you don't have 'git' installed
105-
python3 -m pip install -U https://github.com/python/mypy/zipball/master
105+
python3 -m pip install -U https://github.com/python/mypy/zipball/main
106106
```
107107

108108
Now you can type-check the [statically typed parts] of a program like this:

docs/source/additional_features.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Your CI script might work like this:
247247

248248
* Create a tarball from the ``.mypy_cache`` directory.
249249

250-
* Determine the current git master branch commit id (say, using
250+
* Determine the current git main branch commit id (say, using
251251
``git rev-parse HEAD``).
252252

253253
* Upload the tarball to the shared repository with a name derived from the
@@ -262,13 +262,13 @@ populates the local ``.mypy_cache`` directory from the shared
262262
repository and then runs a normal incremental build.
263263

264264
The wrapper script needs some logic to determine the most recent
265-
central repository commit (by convention, the ``origin/master`` branch
265+
central repository commit (by convention, the ``origin/main`` branch
266266
for git) the local development branch is based on. In a typical git
267267
setup you can do it like this:
268268

269269
.. code::
270270
271-
git merge-base HEAD origin/master
271+
git merge-base HEAD origin/main
272272
273273
The next step is to download the cache data (contents of the
274274
``.mypy_cache`` directory) from the shared repository based on the
@@ -315,11 +315,11 @@ at least if your codebase is hundreds of thousands of lines or more:
315315
potentially large number of changes in an incremental build, as this can
316316
be much slower than downloading cache data and restarting the daemon.
317317

318-
* If the current local branch is based on a very recent master commit,
318+
* If the current local branch is based on a very recent main commit,
319319
the remote cache data may not yet be available for that commit, as
320320
there will necessarily be some latency to build the cache files. It
321321
may be a good idea to look for cache data for, say, the 5 latest
322-
master commits and use the most recent data that is available.
322+
main commits and use the most recent data that is available.
323323

324324
* If the remote cache is not accessible for some reason (say, from a public
325325
network), the script can still fall back to a normal incremental build.

docs/source/extending_mypy.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ can be specified after colon:
9393
9494
In the following sections we describe the basics of the plugin system with
9595
some examples. For more technical details, please read the docstrings in
96-
`mypy/plugin.py <https://github.com/python/mypy/blob/master/mypy/plugin.py>`_
96+
`mypy/plugin.py <https://github.com/python/mypy/blob/main/mypy/plugin.py>`_
9797
in mypy source code. Also you can find good examples in the bundled plugins
98-
located in `mypy/plugins <https://github.com/python/mypy/tree/master/mypy/plugins>`_.
98+
located in `mypy/plugins <https://github.com/python/mypy/tree/main/mypy/plugins>`_.
9999

100100
High-level overview
101101
*******************

0 commit comments

Comments
 (0)