From 6ca166dfea708861b55a9e3789665a90d895bb1c Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 19:08:16 +0000 Subject: [PATCH] chore(python): rename default branch to main (#245) --- google-cloud-speech/.github/.OwlBot.lock.yaml | 2 +- google-cloud-speech/CONTRIBUTING.rst | 6 ++-- google-cloud-speech/docs/conf.py | 16 ++++------ google-cloud-speech/owlbot.py | 29 ------------------- 4 files changed, 9 insertions(+), 44 deletions(-) diff --git a/google-cloud-speech/.github/.OwlBot.lock.yaml b/google-cloud-speech/.github/.OwlBot.lock.yaml index ef3cb34f66fd..c07f148f0b0b 100644 --- a/google-cloud-speech/.github/.OwlBot.lock.yaml +++ b/google-cloud-speech/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-python:latest - digest: sha256:1456ea2b3b523ccff5e13030acef56d1de28f21249c62aa0f196265880338fa7 + digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d diff --git a/google-cloud-speech/CONTRIBUTING.rst b/google-cloud-speech/CONTRIBUTING.rst index a7e2e47e6148..f42747d2a62f 100644 --- a/google-cloud-speech/CONTRIBUTING.rst +++ b/google-cloud-speech/CONTRIBUTING.rst @@ -113,9 +113,9 @@ Coding Style export GOOGLE_CLOUD_TESTING_BRANCH="main" By doing this, you are specifying the location of the most up-to-date - version of ``python-speech``. The the suggested remote name ``upstream`` - should point to the official ``googleapis`` checkout and the - the branch should be the main branch on that remote (``main``). + version of ``python-speech``. The + remote name ``upstream`` should point to the official ``googleapis`` + checkout and the branch should be the default branch on that remote (``main``). - This repository contains configuration for the `pre-commit `__ tool, which automates checking diff --git a/google-cloud-speech/docs/conf.py b/google-cloud-speech/docs/conf.py index ce8d5df3620a..9bb1797242b6 100644 --- a/google-cloud-speech/docs/conf.py +++ b/google-cloud-speech/docs/conf.py @@ -76,8 +76,8 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = "index" +# The root toctree document. +root_doc = "index" # General information about the project. project = "google-cloud-speech" @@ -280,7 +280,7 @@ # author, documentclass [howto, manual, or own class]). latex_documents = [ ( - master_doc, + root_doc, "google-cloud-speech.tex", "google-cloud-speech Documentation", author, @@ -314,13 +314,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ( - master_doc, - "google-cloud-speech", - "google-cloud-speech Documentation", - [author], - 1, - ) + (root_doc, "google-cloud-speech", "google-cloud-speech Documentation", [author], 1,) ] # If true, show URL addresses after external links. @@ -334,7 +328,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-cloud-speech", "google-cloud-speech Documentation", author, diff --git a/google-cloud-speech/owlbot.py b/google-cloud-speech/owlbot.py index 74aa915856f2..2b1152a9d3c8 100644 --- a/google-cloud-speech/owlbot.py +++ b/google-cloud-speech/owlbot.py @@ -69,32 +69,3 @@ class SpeechClient(SpeechHelpers, SpeechClient): python.py_samples(skip_readmes=True) s.shell.run(["nox", "-s", "blacken"], hide_output=False) - -# ---------------------------------------------------------------------------- -# Main Branch migration -# ---------------------------------------------------------------------------- - -s.replace( - "*.rst", - "master", - "main" -) - -s.replace( - "*.rst", - "google-cloud-python/blob/main", - "google-cloud-python/blob/master" -) - -s.replace( - "CONTRIBUTING.rst", - "kubernetes/community/blob/main", - "kubernetes/community/blob/master" -) - -s.replace( - ".kokoro/*", - "master", - "main" -) -