Skip to content

Commit a2c7bc7

Browse files
committed
chore: migrate default branch from master to main
1 parent cbb1f88 commit a2c7bc7

File tree

11 files changed

+20
-15
lines changed

11 files changed

+20
-15
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# The python-samples-reviewers team is the default owner for samples changes
1111
/samples/ @googleapis/python-samples-owners
1212

13-
# For more information, see https://github.com/googleapis/repo-automation-bots/blob/master/packages/auto-approve/README.md
13+
# For more information, see https://github.com/googleapis/repo-automation-bots/blob/main/packages/auto-approve/README.md
1414
.github/auto-approve.yml @googleapis/github-automation @googleapis/yoshi-python
1515

1616
# The following is needed to auto-approve changes to static discovery artifacts and generated documentation.

.github/auto-approve.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://github.com/googleapis/repo-automation-bots/tree/master/packages/auto-approve
1+
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/auto-approve
22

33
rules:
44

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
id: date
3232
run: echo "::set-output name=current_date::$(date +'%Y-%m-%d')"
3333

34-
- name: Check out master branch
34+
- name: Check out main branch
3535
uses: actions/checkout@v2
3636
with:
37-
ref: refs/heads/master
37+
ref: refs/heads/main
3838

3939
- name: Create branch
4040
run: |
@@ -113,7 +113,7 @@ jobs:
113113
const createPrResult = await github.pulls.create({
114114
owner: owner,
115115
repo: repo,
116-
base: 'master',
116+
base: 'main',
117117
head: `${owner}:${branch}`,
118118
title: prTitle,
119119
body: prBody

.kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ python3 -m pip install --upgrade --quiet nox
4141
python3 -m nox --version
4242

4343
# If this is a continuous build, send the test log to the FlakyBot.
44-
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
44+
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
4545
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
4646
cleanup() {
4747
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot

.kokoro/test-samples-impl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do
8080
EXIT=$?
8181

8282
# If this is a periodic build, send the test log to the FlakyBot.
83-
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
83+
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
8484
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
8585
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
8686
$KOKORO_GFILE_DIR/linux_amd64/flakybot

.repo-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"name": "google-api-python-client",
44
"name_pretty": "Google API Python Client",
5-
"client_documentation": "https://github.com/googleapis/google-api-python-client/tree/master/docs#google-api-client-library-for-python-docs",
5+
"client_documentation": "https://github.com/googleapis/google-api-python-client/tree/main/docs#google-api-client-library-for-python-docs",
66
"issue_tracker": "https://github.com/googleapis/google-api-python-client/issues",
77
"release_level": "ga",
88
"language": "python",

CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To summarize here: when contributing, please:
1313
* Fork this repository and use github pull requests for all submissions
1414
* Follow
1515
`Contributor Code of Conduct
16-
<https://github.com/googleapis/google-api-python-client/blob/master/CODE_OF_CONDUCT.md>`__
16+
<https://github.com/googleapis/google-api-python-client/blob/main/CODE_OF_CONDUCT.md>`__
1717
and `Community Guidelines <https://opensource.google/conduct/>`__
1818
* Follow `Google Python Style Guide <https://google.github.io/styleguide/pyguide.html>`__
1919
and `this commit authoring style <http://chris.beams.io/posts/git-commit/#seven-rules>`__

README.md

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

55
This is the [Google API Python client library](https://cloud.google.com/apis/docs/client-libraries-explained#google_api_client_libraries)
66
for Google's discovery based APIs. To get started, please see the
7-
[docs folder](https://github.com/googleapis/google-api-python-client/blob/master/docs/README.md).
7+
[docs folder](https://github.com/googleapis/google-api-python-client/blob/main/docs/README.md).
88

99
This library is considered complete and is in maintenance mode. This means
1010
that we will address critical bugs and security issues but will not add any
@@ -30,12 +30,12 @@ from the client library directly. New versions of this library are released week
3030
As a result of caching the discovery documents, the size of this package is at least
3131
50 MB larger compared to the previous version.
3232

33-
Please see the [Migration Guide](https://github.com/googleapis/google-api-python-client/blob/master/UPGRADING.md)
33+
Please see the [Migration Guide](https://github.com/googleapis/google-api-python-client/blob/main/UPGRADING.md)
3434
for more information.
3535

3636
## Documentation
3737

38-
See the [docs folder](https://github.com/googleapis/google-api-python-client/blob/master/docs/README.md) for more detailed instructions and additional documentation.
38+
See the [docs folder](https://github.com/googleapis/google-api-python-client/blob/main/docs/README.md) for more detailed instructions and additional documentation.
3939

4040
## Other Google API libraries
4141

@@ -115,6 +115,6 @@ For development you will also need the following libraries:
115115

116116
## Contributing
117117

118-
Please see our [Contribution Guide](https://github.com/googleapis/google-api-python-client/blob/master/CONTRIBUTING.rst).
118+
Please see our [Contribution Guide](https://github.com/googleapis/google-api-python-client/blob/main/CONTRIBUTING.rst).
119119
In particular, we love pull requests - but please make sure to sign
120120
the contributor license agreement.

docs/mocks.md

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

33
The use of [Mock objects](https://en.wikipedia.org/wiki/Mock_object) is a standard testing methodology for Python and other object-oriented languages. This library defines Mock classes that simulate responses to API calls. You can use them to test how your code handles basic interactions with Google APIs.
44

5-
> **Note:** Many of the [Python Client Library test scripts](https://github.com/googleapis/google-api-python-client/tree/master/tests) use these classes.
5+
> **Note:** Many of the [Python Client Library test scripts](https://github.com/googleapis/google-api-python-client/tree/main/tests) use these classes.
66
77
## HttpMock
88

owlbot.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,8 @@
3939
# ----------------------------------------------------------------------------
4040

4141
python.py_samples(skip_readmes=True)
42+
43+
# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged
44+
45+
# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
46+
s.replace(".kokoro/*.sh", "repo-automation-bots/tree/main", "repo-automation-bots/tree/main")

scripts/updatediscoveryartifacts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
[
5353
"git",
5454
"diff",
55-
"origin/master",
55+
"origin/main",
5656
"--name-only",
5757
"--",
5858
DISCOVERY_DOC_DIR / "*.json",

0 commit comments

Comments
 (0)