Skip to content
This repository was archived by the owner on Sep 5, 2023. It is now read-only.

Commit a25a270

Browse files
authored
chore: migrate default branch to main (#110)
* chore: migrate default branch from master to main * Rename reference to master in generated docstrings
1 parent c8c90b5 commit a25a270

File tree

13 files changed

+74
-21
lines changed

13 files changed

+74
-21
lines changed

.kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ python3 -m pip install --upgrade --quiet nox
4141
python3 -m nox --version
4242

4343
# If this is a continuous build, send the test log to the FlakyBot.
44-
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
44+
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
4545
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
4646
cleanup() {
4747
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot

.kokoro/test-samples-impl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do
8080
EXIT=$?
8181

8282
# If this is a periodic build, send the test log to the FlakyBot.
83-
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
83+
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
8484
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
8585
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
8686
$KOKORO_GFILE_DIR/linux_amd64/flakybot

CONTRIBUTING.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ You'll have to create a development environment using a Git checkout:
5050
# Configure remotes such that you can pull changes from the googleapis/python-redis
5151
# repository into your local repository.
5252
$ git remote add upstream git@github.com:googleapis/python-redis.git
53-
# fetch and merge changes from upstream into master
53+
# fetch and merge changes from upstream into main
5454
$ git fetch upstream
55-
$ git merge upstream/master
55+
$ git merge upstream/main
5656

5757
Now your local repo is set up such that you will push changes to your GitHub
5858
repo, from which you can submit a pull request.
@@ -110,12 +110,12 @@ Coding Style
110110
variables::
111111

112112
export GOOGLE_CLOUD_TESTING_REMOTE="upstream"
113-
export GOOGLE_CLOUD_TESTING_BRANCH="master"
113+
export GOOGLE_CLOUD_TESTING_BRANCH="main"
114114

115115
By doing this, you are specifying the location of the most up-to-date
116116
version of ``python-redis``. The the suggested remote name ``upstream``
117117
should point to the official ``googleapis`` checkout and the
118-
the branch should be the main branch on that remote (``master``).
118+
the branch should be the main branch on that remote (``main``).
119119

120120
- This repository contains configuration for the
121121
`pre-commit <https://pre-commit.com/>`__ tool, which automates checking
@@ -209,7 +209,7 @@ The `description on PyPI`_ for the project comes directly from the
209209
``README``. Due to the reStructuredText (``rst``) parser used by
210210
PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst``
211211
instead of
212-
``https://github.com/googleapis/python-redis/blob/master/CONTRIBUTING.rst``)
212+
``https://github.com/googleapis/python-redis/blob/main/CONTRIBUTING.rst``)
213213
may cause problems creating links or rendering the description.
214214

215215
.. _description on PyPI: https://pypi.org/project/google-cloud-redis
@@ -234,7 +234,7 @@ We support:
234234

235235
Supported versions can be found in our ``noxfile.py`` `config`_.
236236

237-
.. _config: https://github.com/googleapis/python-redis/blob/master/noxfile.py
237+
.. _config: https://github.com/googleapis/python-redis/blob/main/noxfile.py
238238

239239

240240
We also explicitly decided to support Python 3 beginning with version 3.6.

docs/conf.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
# The encoding of source files.
7777
# source_encoding = 'utf-8-sig'
7878

79-
# The master toctree document.
80-
master_doc = "index"
79+
# The root toctree document.
80+
root_doc = "index"
8181

8282
# General information about the project.
8383
project = "google-cloud-redis"
@@ -280,7 +280,7 @@
280280
# author, documentclass [howto, manual, or own class]).
281281
latex_documents = [
282282
(
283-
master_doc,
283+
root_doc,
284284
"google-cloud-redis.tex",
285285
"google-cloud-redis Documentation",
286286
author,
@@ -314,7 +314,7 @@
314314
# One entry per manual page. List of tuples
315315
# (source start file, name, description, authors, manual section).
316316
man_pages = [
317-
(master_doc, "google-cloud-redis", "google-cloud-redis Documentation", [author], 1,)
317+
(root_doc, "google-cloud-redis", "google-cloud-redis Documentation", [author], 1,)
318318
]
319319

320320
# If true, show URL addresses after external links.
@@ -328,7 +328,7 @@
328328
# dir menu entry, description, category)
329329
texinfo_documents = [
330330
(
331-
master_doc,
331+
root_doc,
332332
"google-cloud-redis",
333333
"google-cloud-redis Documentation",
334334
author,

google/cloud/redis_v1/services/cloud_redis/async_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ async def failover_instance(
872872
timeout: float = None,
873873
metadata: Sequence[Tuple[str, str]] = (),
874874
) -> operation_async.AsyncOperation:
875-
r"""Initiates a failover of the master node to current
875+
r"""Initiates a failover of the main node to current
876876
replica node for a specific STANDARD tier Cloud
877877
Memorystore for Redis instance.
878878

google/cloud/redis_v1/services/cloud_redis/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ def failover_instance(
10651065
timeout: float = None,
10661066
metadata: Sequence[Tuple[str, str]] = (),
10671067
) -> operation.Operation:
1068-
r"""Initiates a failover of the master node to current
1068+
r"""Initiates a failover of the main node to current
10691069
replica node for a specific STANDARD tier Cloud
10701070
Memorystore for Redis instance.
10711071

google/cloud/redis_v1/services/cloud_redis/transports/grpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ def failover_instance(
492492
) -> Callable[[cloud_redis.FailoverInstanceRequest], operations_pb2.Operation]:
493493
r"""Return a callable for the failover instance method over gRPC.
494494
495-
Initiates a failover of the master node to current
495+
Initiates a failover of the main node to current
496496
replica node for a specific STANDARD tier Cloud
497497
Memorystore for Redis instance.
498498

google/cloud/redis_v1/services/cloud_redis/transports/grpc_asyncio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ def failover_instance(
509509
]:
510510
r"""Return a callable for the failover instance method over gRPC.
511511
512-
Initiates a failover of the master node to current
512+
Initiates a failover of the main node to current
513513
replica node for a specific STANDARD tier Cloud
514514
Memorystore for Redis instance.
515515

google/cloud/redis_v1beta1/services/cloud_redis/async_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ async def failover_instance(
873873
timeout: float = None,
874874
metadata: Sequence[Tuple[str, str]] = (),
875875
) -> operation_async.AsyncOperation:
876-
r"""Initiates a failover of the master node to current
876+
r"""Initiates a failover of the main node to current
877877
replica node for a specific STANDARD tier Cloud
878878
Memorystore for Redis instance.
879879

google/cloud/redis_v1beta1/services/cloud_redis/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ def failover_instance(
10661066
timeout: float = None,
10671067
metadata: Sequence[Tuple[str, str]] = (),
10681068
) -> operation.Operation:
1069-
r"""Initiates a failover of the master node to current
1069+
r"""Initiates a failover of the main node to current
10701070
replica node for a specific STANDARD tier Cloud
10711071
Memorystore for Redis instance.
10721072

0 commit comments

Comments
 (0)