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

Commit b94ff22

Browse files
partheaparthea
authored
chore: migrate default branch from master to main (#166)
Towards googleapis/google-cloud-python#10579
1 parent c704b41 commit b94ff22

File tree

6 files changed

+71
-17
lines changed

6 files changed

+71
-17
lines changed

‎.github/sync-repo-settings.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# https://github.com/googleapis/repo-automation-bots/tree/master/packages/sync-repo-settings
2-
# Rules for master branch protection
1+
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings
2+
# Rules for main branch protection
33
branchProtectionRules:
44
# Identifies the protection rule pattern. Name of the branch to be protected.
5-
# Defaults to `master`
6-
- pattern: master
5+
# Defaults to `main`
6+
- pattern: main
77
requiresCodeOwnerReviews: true
88
requiresStrictStatusChecks: true
99
requiredStatusCheckContexts:

‎.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-kms
5151
# repository into your local repository.
5252
$ git remote add upstream git@github.com:googleapis/python-kms.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-kms``. 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-kms/blob/master/CONTRIBUTING.rst``)
212+
``https://github.com/googleapis/python-kms/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-kms
@@ -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-kms/blob/master/noxfile.py
237+
.. _config: https://github.com/googleapis/python-kms/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-kms"
@@ -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-kms.tex",
285285
"google-cloud-kms 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-kms", "google-cloud-kms Documentation", [author], 1,)
317+
(root_doc, "google-cloud-kms", "google-cloud-kms 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-kms",
333333
"google-cloud-kms Documentation",
334334
author,

‎owlbot.py‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,60 @@
6868
)
6969
s.move(templated_files, excludes=[".coveragerc"]) # microgenerator has a good .coveragerc file
7070

71+
# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged
72+
73+
# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
74+
s.replace(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main")
75+
76+
# Customize CONTRIBUTING.rst to replace master with main
77+
s.replace(
78+
"CONTRIBUTING.rst",
79+
"fetch and merge changes from upstream into master",
80+
"fetch and merge changes from upstream into main",
81+
)
82+
83+
s.replace(
84+
"CONTRIBUTING.rst",
85+
"git merge upstream/master",
86+
"git merge upstream/main",
87+
)
88+
89+
s.replace(
90+
"CONTRIBUTING.rst",
91+
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
92+
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
93+
)
94+
95+
s.replace(
96+
"CONTRIBUTING.rst",
97+
"remote \(``master``\)",
98+
"remote (``main``)",
99+
)
100+
101+
s.replace(
102+
"CONTRIBUTING.rst",
103+
"blob/master/CONTRIBUTING.rst",
104+
"blob/main/CONTRIBUTING.rst",
105+
)
106+
107+
s.replace(
108+
"CONTRIBUTING.rst",
109+
"blob/master/noxfile.py",
110+
"blob/main/noxfile.py",
111+
)
112+
113+
s.replace(
114+
"docs/conf.py",
115+
"master_doc",
116+
"root_doc",
117+
)
118+
119+
s.replace(
120+
"docs/conf.py",
121+
"# The master toctree document.",
122+
"# The root toctree document.",
123+
)
124+
71125
# ----------------------------------------------------------------------------
72126
# Samples templates
73127
# ----------------------------------------------------------------------------

0 commit comments

Comments
 (0)