From 6d1ce88e292479279f25afe406771aefeb63ed97 Mon Sep 17 00:00:00 2001 From: Dan Lee Date: Tue, 24 Aug 2021 02:38:23 +0000 Subject: [PATCH 1/8] docs: migrate to main branch --- owlbot.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/owlbot.py b/owlbot.py index 965502b..e7c3d4f 100644 --- a/owlbot.py +++ b/owlbot.py @@ -43,3 +43,38 @@ ) s.shell.run(["nox", "-s", "blacken"], hide_output=False) + +# ---------------------------------------------------------------------------- +# Main Branch migration +# ---------------------------------------------------------------------------- + +s.replace( + "*.rst", + "master", + "main" +) + +s.replace( + "CONTRIBUTING.rst", + "kubernetes/community/blob/main", + "kubernetes/community/blob/master" +) + +s.replace( + "docs/*", + "master", + "main" +) + +s.replace( + "docs/conf.py", + "main_doc", + "root_doc" +) + +s.replace( + ".kokoro/*", + "master", + "main" +) + From a8341af5bc5ea07f5a8b9d7a585c48e4f9d299ba Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 24 Aug 2021 02:40:09 +0000 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .kokoro/build.sh | 2 +- .kokoro/test-samples-impl.sh | 2 +- CONTRIBUTING.rst | 12 ++++++------ README.rst | 4 ++-- docs/README.rst | 4 ++-- docs/conf.py | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 9138623..43da493 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 311a8d5..8a324c9 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/CONTRIBUTING.rst b/CONTRIBUTING.rst index 2fa46ac..01dc65b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -50,9 +50,9 @@ You'll have to create a development environment using a Git checkout: # Configure remotes such that you can pull changes from the googleapis/python-domains # repository into your local repository. $ git remote add upstream git@github.com:googleapis/python-domains.git - # fetch and merge changes from upstream into master + # fetch and merge changes from upstream into main $ git fetch upstream - $ git merge upstream/master + $ git merge upstream/main Now your local repo is set up such that you will push changes to your GitHub repo, from which you can submit a pull request. @@ -110,12 +110,12 @@ Coding Style variables:: export GOOGLE_CLOUD_TESTING_REMOTE="upstream" - export GOOGLE_CLOUD_TESTING_BRANCH="master" + export GOOGLE_CLOUD_TESTING_BRANCH="main" By doing this, you are specifying the location of the most up-to-date version of ``python-domains``. 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 (``master``). + the branch should be the main branch on that remote (``main``). - This repository contains configuration for the `pre-commit `__ tool, which automates checking @@ -209,7 +209,7 @@ The `description on PyPI`_ for the project comes directly from the ``README``. Due to the reStructuredText (``rst``) parser used by PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst`` instead of -``https://github.com/googleapis/python-domains/blob/master/CONTRIBUTING.rst``) +``https://github.com/googleapis/python-domains/blob/main/CONTRIBUTING.rst``) may cause problems creating links or rendering the description. .. _description on PyPI: https://pypi.org/project/google-cloud-domains @@ -234,7 +234,7 @@ We support: Supported versions can be found in our ``noxfile.py`` `config`_. -.. _config: https://github.com/googleapis/python-domains/blob/master/noxfile.py +.. _config: https://github.com/googleapis/python-domains/blob/main/noxfile.py We also explicitly decided to support Python 3 beginning with version 3.6. diff --git a/README.rst b/README.rst index 3ce7ad6..24ff364 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ Python Client for Cloud Domains - `Product Documentation`_ .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg - :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support + :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#beta-support .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-domains.svg :target: https://pypi.org/project/google-cloud-domains/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-domains.svg @@ -79,4 +79,4 @@ Next Steps APIs that we cover. .. _Cloud Domains Product documentation: https://cloud.google.com/domains/docs -.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file +.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file diff --git a/docs/README.rst b/docs/README.rst index 3ce7ad6..24ff364 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -9,7 +9,7 @@ Python Client for Cloud Domains - `Product Documentation`_ .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg - :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support + :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#beta-support .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-domains.svg :target: https://pypi.org/project/google-cloud-domains/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-domains.svg @@ -79,4 +79,4 @@ Next Steps APIs that we cover. .. _Cloud Domains Product documentation: https://cloud.google.com/domains/docs -.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file +.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 2d3cafb..df89e04 100644 --- a/docs/conf.py +++ b/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 main toctree document. +root_doc = "index" # General information about the project. project = "google-cloud-domains" @@ -280,7 +280,7 @@ # author, documentclass [howto, manual, or own class]). latex_documents = [ ( - master_doc, + root_doc, "google-cloud-domains.tex", "google-cloud-domains Documentation", author, @@ -315,7 +315,7 @@ # (source start file, name, description, authors, manual section). man_pages = [ ( - master_doc, + root_doc, "google-cloud-domains", "google-cloud-domains Documentation", [author], @@ -334,7 +334,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-cloud-domains", "google-cloud-domains Documentation", author, From 42f55b81da709c5437065734f3d1a90394bc9d08 Mon Sep 17 00:00:00 2001 From: Dan Lee Date: Tue, 24 Aug 2021 21:35:31 +0000 Subject: [PATCH 3/8] chore: update owlbot --- owlbot.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/owlbot.py b/owlbot.py index e7c3d4f..483cc8a 100644 --- a/owlbot.py +++ b/owlbot.py @@ -54,6 +54,12 @@ "main" ) +s.replace( + "README.rst", + "google-cloud-python/blob/main/README.rst", + "google-cloud-python/blob/master/README.rst" +) + s.replace( "CONTRIBUTING.rst", "kubernetes/community/blob/main", From fbb41234a904f4bd70d8e0ed8ecc88eee05d9daf Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 24 Aug 2021 21:37:51 +0000 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 24ff364..3ce7ad6 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ Python Client for Cloud Domains - `Product Documentation`_ .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg - :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#beta-support + :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-domains.svg :target: https://pypi.org/project/google-cloud-domains/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-domains.svg @@ -79,4 +79,4 @@ Next Steps APIs that we cover. .. _Cloud Domains Product documentation: https://cloud.google.com/domains/docs -.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file +.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file From e2b56a97064bdfb76bb487fb0c078dae5212ae8c Mon Sep 17 00:00:00 2001 From: Dan Lee Date: Tue, 24 Aug 2021 21:40:36 +0000 Subject: [PATCH 5/8] chore: update owlbot --- owlbot.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/owlbot.py b/owlbot.py index 483cc8a..0e86e13 100644 --- a/owlbot.py +++ b/owlbot.py @@ -54,12 +54,6 @@ "main" ) -s.replace( - "README.rst", - "google-cloud-python/blob/main/README.rst", - "google-cloud-python/blob/master/README.rst" -) - s.replace( "CONTRIBUTING.rst", "kubernetes/community/blob/main", @@ -78,6 +72,12 @@ "root_doc" ) +s.replace( + "*/README.rst", + "google-cloud-python/blob/main/README.rst", + "google-cloud-python/blob/master/README.rst" +) + s.replace( ".kokoro/*", "master", From bb0b3d6bd321d200f41f74ae34d247f4f84b4854 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 24 Aug 2021 21:42:09 +0000 Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.rst | 4 ++-- docs/README.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 3ce7ad6..24ff364 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ Python Client for Cloud Domains - `Product Documentation`_ .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg - :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support + :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#beta-support .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-domains.svg :target: https://pypi.org/project/google-cloud-domains/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-domains.svg @@ -79,4 +79,4 @@ Next Steps APIs that we cover. .. _Cloud Domains Product documentation: https://cloud.google.com/domains/docs -.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file +.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file diff --git a/docs/README.rst b/docs/README.rst index 24ff364..3ce7ad6 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -9,7 +9,7 @@ Python Client for Cloud Domains - `Product Documentation`_ .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg - :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#beta-support + :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-domains.svg :target: https://pypi.org/project/google-cloud-domains/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-domains.svg @@ -79,4 +79,4 @@ Next Steps APIs that we cover. .. _Cloud Domains Product documentation: https://cloud.google.com/domains/docs -.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file +.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file From 98082e650ab1e220b0c74dfe57a9c4a441c260b8 Mon Sep 17 00:00:00 2001 From: Dan Lee Date: Tue, 24 Aug 2021 21:44:27 +0000 Subject: [PATCH 7/8] chore: update owlbot --- owlbot.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/owlbot.py b/owlbot.py index 0e86e13..f5091a1 100644 --- a/owlbot.py +++ b/owlbot.py @@ -73,7 +73,13 @@ ) s.replace( - "*/README.rst", + "README.rst", + "google-cloud-python/blob/main/README.rst", + "google-cloud-python/blob/master/README.rst" +) + +s.replace( + "docs/README.rst", "google-cloud-python/blob/main/README.rst", "google-cloud-python/blob/master/README.rst" ) From e85c2c0cb18f61e74561d55cfdf181a0b833c82f Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 24 Aug 2021 21:45:43 +0000 Subject: [PATCH 8/8] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 24ff364..3ce7ad6 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ Python Client for Cloud Domains - `Product Documentation`_ .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg - :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#beta-support + :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-domains.svg :target: https://pypi.org/project/google-cloud-domains/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-domains.svg @@ -79,4 +79,4 @@ Next Steps APIs that we cover. .. _Cloud Domains Product documentation: https://cloud.google.com/domains/docs -.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file +.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file