From e288eb1c32b3686fb1b11547d77b0b6c2585cfe0 Mon Sep 17 00:00:00 2001 From: Dan Lee Date: Mon, 30 Aug 2021 19:55:48 +0000 Subject: [PATCH 1/4] chore: migrate to main branch --- owlbot.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/owlbot.py b/owlbot.py index 6ae69bc..867c3f5 100644 --- a/owlbot.py +++ b/owlbot.py @@ -43,3 +43,26 @@ ) # the 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( + "CONTRIBUTING.rst", + "kubernetes/community/blob/main", + "kubernetes/community/blob/master" +) + +s.replace( + ".kokoro/*", + "master", + "main" +) + From 06f7971306da43033c8524f786dbbb146d8b6099 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 30 Aug 2021 19:57:28 +0000 Subject: [PATCH 2/4] =?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 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 03a459c..67faddb 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 0cb77b9..3c14905 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-memcache # repository into your local repository. $ git remote add upstream git@github.com:googleapis/python-memcache.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-memcache``. 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-memcache/blob/master/CONTRIBUTING.rst``) +``https://github.com/googleapis/python-memcache/blob/main/CONTRIBUTING.rst``) may cause problems creating links or rendering the description. .. _description on PyPI: https://pypi.org/project/google-cloud-memcache @@ -234,7 +234,7 @@ We support: Supported versions can be found in our ``noxfile.py`` `config`_. -.. _config: https://github.com/googleapis/python-memcache/blob/master/noxfile.py +.. _config: https://github.com/googleapis/python-memcache/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 74d0643..f643869 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ compatible with OSS Memcached protocol. - `Product Documentation`_ .. |GA| image:: https://img.shields.io/badge/support-ga-gold.svg - :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#general-availability + :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#general-availability .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-memcache.svg :target: https://pypi.org/project/google-cloud-memcache/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-memcache.svg @@ -80,4 +80,4 @@ Next Steps APIs that we cover. .. _Cloud Memorystore for Memcached API Product documentation: https://cloud.google.com/memorystore/docs/memcached/ -.. _repository’s main README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file +.. _repository’s main README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file From 1f418a428b2a19d57a5ecff2dcf5dc75999f956a Mon Sep 17 00:00:00 2001 From: Dan Lee Date: Mon, 30 Aug 2021 20:08:14 +0000 Subject: [PATCH 3/4] chore: update owlbot --- owlbot.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/owlbot.py b/owlbot.py index 867c3f5..c10feed 100644 --- a/owlbot.py +++ b/owlbot.py @@ -54,6 +54,12 @@ "main" ) +s.replace( + "*.rst", + "google-cloud-python/blob/main", + "google-cloud-python/blob/master" +) + s.replace( "CONTRIBUTING.rst", "kubernetes/community/blob/main", From 9681e7b2b2d0c01e946a41298691cea0f0864503 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 30 Aug 2021 20:10:24 +0000 Subject: [PATCH 4/4] =?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 f643869..74d0643 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ compatible with OSS Memcached protocol. - `Product Documentation`_ .. |GA| image:: https://img.shields.io/badge/support-ga-gold.svg - :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#general-availability + :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#general-availability .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-memcache.svg :target: https://pypi.org/project/google-cloud-memcache/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-memcache.svg @@ -80,4 +80,4 @@ Next Steps APIs that we cover. .. _Cloud Memorystore for Memcached API Product documentation: https://cloud.google.com/memorystore/docs/memcached/ -.. _repository’s main README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file +.. _repository’s main README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file