Skip to content

Commit 3aaf6b9

Browse files
authored
'master' branch was updated to 'main' (#9045)
1 parent a7cf614 commit 3aaf6b9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/mypy_primer.yml

Lines changed: 4 additions & 4 deletions
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:
77
- 'stdlib/**'
@@ -41,17 +41,17 @@ jobs:
4141
MYPY_VERSION=$(grep mypy== requirements-tests.txt | cut -d = -f 3)
4242
echo "new commit"
4343
git rev-list --format=%s --max-count=1 $GITHUB_SHA
44-
git checkout -b upstream_master origin/master
44+
git checkout -b upstream_main origin/main
4545
echo "base commit"
46-
git rev-list --format=%s --max-count=1 upstream_master
46+
git rev-list --format=%s --max-count=1 upstream_main
4747
echo ''
4848
cd ..
4949
# fail action if exit code isn't zero or one
5050
(
5151
mypy_primer \
5252
--new v${MYPY_VERSION} --old v${MYPY_VERSION} \
5353
--custom-typeshed-repo typeshed_to_test \
54-
--new-typeshed $GITHUB_SHA --old-typeshed upstream_master \
54+
--new-typeshed $GITHUB_SHA --old-typeshed upstream_main \
5555
--num-shards 4 --shard-index ${{ matrix.shard-index }} \
5656
--debug \
5757
--output concise \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Tests](https://github.com/python/typeshed/actions/workflows/tests.yml/badge.svg)](https://github.com/python/typeshed/actions/workflows/tests.yml)
44
[![Chat at https://gitter.im/python/typing](https://badges.gitter.im/python/typing.svg)](https://gitter.im/python/typing?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
5-
[![Pull Requests Welcome](https://img.shields.io/badge/pull%20requests-welcome-brightgreen.svg)](https://github.com/python/typeshed/blob/master/CONTRIBUTING.md)
5+
[![Pull Requests Welcome](https://img.shields.io/badge/pull%20requests-welcome-brightgreen.svg)](https://github.com/python/typeshed/blob/main/CONTRIBUTING.md)
66

77
## About
88

@@ -45,7 +45,7 @@ details, see the documentation for your type checker.
4545
typeshed includes a package `_typeshed` as part of the standard library.
4646
This package and its submodules contains utility types, but is not
4747
available at runtime. For more information about how to use this package,
48-
[see the `stdlib/_typeshed` directory](https://github.com/python/typeshed/tree/master/stdlib/_typeshed).
48+
[see the `stdlib/_typeshed` directory](https://github.com/python/typeshed/tree/main/stdlib/_typeshed).
4949

5050
## Discussion
5151

scripts/stubsabot.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ async def create_or_update_pull_request(*, title: str, body: str, branch_name: s
480480

481481
async with session.post(
482482
f"https://api.github.com/repos/{TYPESHED_OWNER}/typeshed/pulls",
483-
json={"title": title, "body": body, "head": f"{fork_owner}:{branch_name}", "base": "master"},
483+
json={"title": title, "body": body, "head": f"{fork_owner}:{branch_name}", "base": "main"},
484484
headers=get_github_api_headers(),
485485
) as response:
486486
resp_json = await response.json()
@@ -490,7 +490,7 @@ async def create_or_update_pull_request(*, title: str, body: str, branch_name: s
490490
# Find the existing PR
491491
async with session.get(
492492
f"https://api.github.com/repos/{TYPESHED_OWNER}/typeshed/pulls",
493-
params={"state": "open", "head": f"{fork_owner}:{branch_name}", "base": "master"},
493+
params={"state": "open", "head": f"{fork_owner}:{branch_name}", "base": "main"},
494494
headers=get_github_api_headers(),
495495
) as response:
496496
response.raise_for_status()
@@ -606,7 +606,7 @@ async def suggest_typeshed_update(update: Update, session: aiohttp.ClientSession
606606
title = f"[stubsabot] Bump {update.distribution} to {update.new_version_spec}"
607607
async with _repo_lock:
608608
branch_name = f"{BRANCH_PREFIX}/{normalize(update.distribution)}"
609-
subprocess.check_call(["git", "checkout", "-B", branch_name, "origin/master"])
609+
subprocess.check_call(["git", "checkout", "-B", branch_name, "origin/main"])
610610
with open(update.stub_path / "METADATA.toml", "rb") as f:
611611
meta = tomlkit.load(f)
612612
meta["version"] = update.new_version_spec
@@ -632,7 +632,7 @@ async def suggest_typeshed_obsolete(obsolete: Obsolete, session: aiohttp.ClientS
632632
title = f"[stubsabot] Mark {obsolete.distribution} as obsolete since {obsolete.obsolete_since_version}"
633633
async with _repo_lock:
634634
branch_name = f"{BRANCH_PREFIX}/{normalize(obsolete.distribution)}"
635-
subprocess.check_call(["git", "checkout", "-B", branch_name, "origin/master"])
635+
subprocess.check_call(["git", "checkout", "-B", branch_name, "origin/main"])
636636
with open(obsolete.stub_path / "METADATA.toml", "rb") as f:
637637
meta = tomlkit.load(f)
638638
obs_string = tomlkit.string(obsolete.obsolete_since_version)

0 commit comments

Comments
 (0)