Skip to content

Commit

Permalink
chore: migrate default branch from master to main (#1498)
Browse files Browse the repository at this point in the history
  • Loading branch information
parthea committed Aug 25, 2021
1 parent cbb1f88 commit e9a5d08
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -10,7 +10,7 @@
# The python-samples-reviewers team is the default owner for samples changes
/samples/ @googleapis/python-samples-owners

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

# The following is needed to auto-approve changes to static discovery artifacts and generated documentation.
Expand Down
2 changes: 1 addition & 1 deletion .github/auto-approve.yml
@@ -1,4 +1,4 @@
# https://github.com/googleapis/repo-automation-bots/tree/master/packages/auto-approve
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/auto-approve

rules:

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Expand Up @@ -31,10 +31,10 @@ jobs:
id: date
run: echo "::set-output name=current_date::$(date +'%Y-%m-%d')"

- name: Check out master branch
- name: Check out main branch
uses: actions/checkout@v2
with:
ref: refs/heads/master
ref: refs/heads/main

- name: Create branch
run: |
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
const createPrResult = await github.pulls.create({
owner: owner,
repo: repo,
base: 'master',
base: 'main',
head: `${owner}:${branch}`,
title: prTitle,
body: prBody
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/build.sh
Expand Up @@ -41,7 +41,7 @@ python3 -m pip install --upgrade --quiet nox
python3 -m nox --version

# If this is a continuous build, send the test log to the FlakyBot.
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
cleanup() {
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/test-samples-impl.sh
Expand Up @@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do
EXIT=$?

# If this is a periodic build, send the test log to the FlakyBot.
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
$KOKORO_GFILE_DIR/linux_amd64/flakybot
Expand Down
2 changes: 1 addition & 1 deletion .repo-metadata.json
Expand Up @@ -2,7 +2,7 @@
{
"name": "google-api-python-client",
"name_pretty": "Google API Python Client",
"client_documentation": "https://github.com/googleapis/google-api-python-client/tree/master/docs#google-api-client-library-for-python-docs",
"client_documentation": "https://github.com/googleapis/google-api-python-client/tree/main/docs#google-api-client-library-for-python-docs",
"issue_tracker": "https://github.com/googleapis/google-api-python-client/issues",
"release_level": "ga",
"language": "python",
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Expand Up @@ -13,7 +13,7 @@ To summarize here: when contributing, please:
* Fork this repository and use github pull requests for all submissions
* Follow
`Contributor Code of Conduct
<https://github.com/googleapis/google-api-python-client/blob/master/CODE_OF_CONDUCT.md>`__
<https://github.com/googleapis/google-api-python-client/blob/main/CODE_OF_CONDUCT.md>`__
and `Community Guidelines <https://opensource.google/conduct/>`__
* Follow `Google Python Style Guide <https://google.github.io/styleguide/pyguide.html>`__
and `this commit authoring style <http://chris.beams.io/posts/git-commit/#seven-rules>`__
Expand Down
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -4,7 +4,7 @@

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

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

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

## Documentation

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

## Other Google API libraries

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

## Contributing

Please see our [Contribution Guide](https://github.com/googleapis/google-api-python-client/blob/master/CONTRIBUTING.rst).
Please see our [Contribution Guide](https://github.com/googleapis/google-api-python-client/blob/main/CONTRIBUTING.rst).
In particular, we love pull requests - but please make sure to sign
the contributor license agreement.
2 changes: 1 addition & 1 deletion docs/mocks.md
Expand Up @@ -2,7 +2,7 @@

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.

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

Expand Down
5 changes: 5 additions & 0 deletions owlbot.py
Expand Up @@ -39,3 +39,8 @@
# ----------------------------------------------------------------------------

python.py_samples(skip_readmes=True)

# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged

# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
s.replace(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main")
2 changes: 1 addition & 1 deletion scripts/updatediscoveryartifacts.py
Expand Up @@ -52,7 +52,7 @@
[
"git",
"diff",
"origin/master",
"origin/main",
"--name-only",
"--",
DISCOVERY_DOC_DIR / "*.json",
Expand Down

0 comments on commit e9a5d08

Please sign in to comment.