diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 69a53cf0..85db638c 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -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 diff --git a/.kokoro/test-samples-impl.sh b/.kokoro/test-samples-impl.sh index 311a8d54..8a324c9c 100755 --- a/.kokoro/test-samples-impl.sh +++ b/.kokoro/test-samples-impl.sh @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c63e9f2..02a5fb7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -218,7 +218,7 @@ might break the hypothetical usecase of downloading a blob marked with - Modify file not found test to look for the correct error message - Harden tests so they can run with debug logging statements - Add Appveyor support. ([#40](https://github.com/googleapis/google-resumable-media-python/pull/40)) -- Mark the version in `master` as `.dev1`. +- Mark the version in `main` as `.dev1`. ## 0.3.1 diff --git a/README.rst b/README.rst index a698bd8a..8feae1dd 100644 --- a/README.rst +++ b/README.rst @@ -31,4 +31,4 @@ License Apache 2.0 - See `the LICENSE`_ for more information. -.. _the LICENSE: https://github.com/googleapis/google-resumable-media-python/blob/master/LICENSE +.. _the LICENSE: https://github.com/googleapis/google-resumable-media-python/blob/main/LICENSE diff --git a/docs/conf.py b/docs/conf.py index 3896205f..c16787e3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -64,7 +64,7 @@ # source_encoding = 'utf-8-sig' # The main toctree document. -master_doc = "index" +root_doc = "index" # General information about the project. project = u"google-resumable-media" @@ -266,7 +266,7 @@ # author, documentclass [howto, manual, or own class]). latex_documents = [ ( - master_doc, + root_doc, "google-resumable-media.tex", u"google-resumable-media Documentation", author, @@ -301,7 +301,7 @@ # (source start file, name, description, authors, manual section). man_pages = [ ( - master_doc, + root_doc, "google-resumable-media", u"google-resumable-media Documentation", [author], @@ -320,7 +320,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-resumable-media", u"google-resumable-media Documentation", author, diff --git a/owlbot.py b/owlbot.py index 0cf20644..e9ed0b7c 100644 --- a/owlbot.py +++ b/owlbot.py @@ -21,4 +21,16 @@ r'value: "docs-staging-v2-staging"' ) + +# 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") + +s.replace( + "docs/conf.py", + "master_doc", + "root_doc", +) + s.shell.run(["nox", "-s", "blacken"], hide_output=False)