diff --git a/packages/google-cloud-trace/.github/.OwlBot.lock.yaml b/packages/google-cloud-trace/.github/.OwlBot.lock.yaml index ef3cb34f66fd..c07f148f0b0b 100644 --- a/packages/google-cloud-trace/.github/.OwlBot.lock.yaml +++ b/packages/google-cloud-trace/.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/packages/google-cloud-trace/CONTRIBUTING.rst b/packages/google-cloud-trace/CONTRIBUTING.rst index 35d75a057d46..8b85a4e6be78 100644 --- a/packages/google-cloud-trace/CONTRIBUTING.rst +++ b/packages/google-cloud-trace/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-trace``. 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-trace``. 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/packages/google-cloud-trace/docs/conf.py b/packages/google-cloud-trace/docs/conf.py index c4e35f0371ed..ee11ca992722 100644 --- a/packages/google-cloud-trace/docs/conf.py +++ b/packages/google-cloud-trace/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-trace" @@ -280,7 +280,7 @@ # author, documentclass [howto, manual, or own class]). latex_documents = [ ( - master_doc, + root_doc, "google-cloud-trace.tex", "google-cloud-trace Documentation", author, @@ -314,7 +314,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, "google-cloud-trace", "google-cloud-trace Documentation", [author], 1,) + (root_doc, "google-cloud-trace", "google-cloud-trace Documentation", [author], 1,) ] # If true, show URL addresses after external links. @@ -328,7 +328,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-cloud-trace", "google-cloud-trace Documentation", author, diff --git a/packages/google-cloud-trace/owlbot.py b/packages/google-cloud-trace/owlbot.py index fbcc09bfee84..62828fa2e18b 100644 --- a/packages/google-cloud-trace/owlbot.py +++ b/packages/google-cloud-trace/owlbot.py @@ -43,36 +43,8 @@ cov_level=98, ) -python.py_samples(skip_readmes=True) - s.move(templated_files, excludes=[".coveragerc"]) # microgenerator has a good .coveragerc file -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" -) +python.py_samples(skip_readmes=True) +s.shell.run(["nox", "-s", "blacken"], hide_output=False)