chore: migrate default branch to main (#479)

plamut · gcf-owl-bot[bot] · web-flow · commit 24f76baeb53c · 2021-08-26T19:48:23.000+02:00
* chore: migrate default branch from master to main * Rename additional references from master to main * Rename blacklist to denylist * Add owlbot replacement rules to persist changes * Move loose s.move() back under the loop in owlbot.py * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -1,9 +1,9 @@
-# https://github.com/googleapis/repo-automation-bots/tree/master/packages/sync-repo-settings
-# Rules for master branch protection
+# https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings
+# Rules for main branch protection
 branchProtectionRules:
 # Identifies the protection rule pattern. Name of the branch to be protected.
-# Defaults to `master`
-- pattern: master
+# Defaults to `main`
+- pattern: main
   requiresCodeOwnerReviews: true
   requiresStrictStatusChecks: true
   requiredStatusCheckContexts:
diff --git 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
@@ -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
@@ -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-pubsub
    # repository into your local repository.
    $ git remote add upstream git@github.com:googleapis/python-pubsub.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-pubsub``. 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 <https://pre-commit.com/>`__ tool, which automates checking
@@ -185,7 +185,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-pubsub/blob/master/CONTRIBUTING.rst``)
+``https://github.com/googleapis/python-pubsub/blob/main/CONTRIBUTING.rst``)
 may cause problems creating links or rendering the description.
 
 .. _description on PyPI: https://pypi.org/project/google-cloud-pubsub
@@ -210,7 +210,7 @@ We support:
 
 Supported versions can be found in our ``noxfile.py`` `config`_.
 
-.. _config: https://github.com/googleapis/python-pubsub/blob/master/noxfile.py
+.. _config: https://github.com/googleapis/python-pubsub/blob/main/noxfile.py
 
 
 We also explicitly decided to support Python 3 beginning with version 3.6.
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -88,7 +88,7 @@ required or optional.
 > of these methods have in large part been preserved.
 
 Some methods have additional keyword only parameters. The available parameters depend
-on the [`google.api.method_signature` annotation](https://github.com/googleapis/python-pubsub/blob/master/google/cloud/pubsub_v1/proto/pubsub.proto#L88)
+on the [`google.api.method_signature` annotation](https://github.com/googleapis/python-pubsub/blob/main/google/cloud/pubsub_v1/proto/pubsub.proto#L88)
 specified by the API producer.
 
 
diff --git 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 root toctree document.
+root_doc = "index"
 
 # General information about the project.
 project = "google-cloud-pubsub"
@@ -279,7 +279,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     (
-        master_doc,
+        root_doc,
         "google-cloud-pubsub.tex",
         "google-cloud-pubsub Documentation",
         author,
@@ -313,13 +313,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (
-        master_doc,
-        "google-cloud-pubsub",
-        "google-cloud-pubsub Documentation",
-        [author],
-        1,
-    )
+    (root_doc, "google-cloud-pubsub", "google-cloud-pubsub Documentation", [author], 1,)
 ]
 
 # If true, show URL addresses after external links.
@@ -333,7 +327,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
     (
-        master_doc,
+        root_doc,
         "google-cloud-pubsub",
         "google-cloud-pubsub Documentation",
         author,
diff --git a/google/cloud/pubsub_v1/_gapic.py b/google/cloud/pubsub_v1/_gapic.py
@@ -17,10 +17,10 @@
 import functools
 
 
-def add_methods(source_class, blacklist=()):
+def add_methods(source_class, denylist=()):
     """Add wrapped versions of the `api` member's methods to the class.
 
-    Any methods passed in `blacklist` are not added.
+    Any methods passed in `denylist` are not added.
     Additionally, any methods explicitly defined on the wrapped class are
     not added.
     """
@@ -48,8 +48,8 @@ def actual_decorator(cls):
             if name.startswith("_"):
                 continue
 
-            # Ignore anything on our blacklist.
-            if name in blacklist:
+            # Ignore anything on our denylist.
+            if name in denylist:
                 continue
 
             # Retrieve the attribute, and ignore it if it is not callable.
diff --git a/google/cloud/pubsub_v1/publisher/client.py b/google/cloud/pubsub_v1/publisher/client.py
@@ -45,7 +45,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-_BLACKLISTED_METHODS = (
+_DENYLISTED_METHODS = (
     "publish",
     "from_service_account_file",
     "from_service_account_json",
@@ -54,7 +54,7 @@
 _raw_proto_pubbsub_message = gapic_types.PubsubMessage.pb()
 
 
-@_gapic.add_methods(publisher_client.PublisherClient, blacklist=_BLACKLISTED_METHODS)
+@_gapic.add_methods(publisher_client.PublisherClient, denylist=_DENYLISTED_METHODS)
 class Client(object):
     """A publisher client for Google Cloud Pub/Sub.
 
diff --git a/google/cloud/pubsub_v1/subscriber/client.py b/google/cloud/pubsub_v1/subscriber/client.py
@@ -34,14 +34,14 @@
     # a PIP package.
     __version__ = "0.0"
 
-_BLACKLISTED_METHODS = (
+_DENYLISTED_METHODS = (
     "publish",
     "from_service_account_file",
     "from_service_account_json",
 )
 
 
-@_gapic.add_methods(subscriber_client.SubscriberClient, blacklist=_BLACKLISTED_METHODS)
+@_gapic.add_methods(subscriber_client.SubscriberClient, denylist=_DENYLISTED_METHODS)
 class Client(object):
     """A subscriber client for Google Cloud Pub/Sub.
 
diff --git a/owlbot.py b/owlbot.py
diff --git a/tests/unit/pubsub_v1/test__gapic.py b/tests/unit/pubsub_v1/test__gapic.py
