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

Commit cbe3b4c

Browse files
authored
chore: migrate default branch from master to main (#234)
1 parent d61d830 commit cbe3b4c

6 files changed

Lines changed: 72 additions & 24 deletions

File tree

.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-automl
5151
# repository into your local repository.
5252
$ git remote add upstream git@github.com:googleapis/python-automl.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-automl``. 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-automl/blob/master/CONTRIBUTING.rst``)
212+
``https://github.com/googleapis/python-automl/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-automl
@@ -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-automl/blob/master/noxfile.py
237+
.. _config: https://github.com/googleapis/python-automl/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 & 11 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-automl"
@@ -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-automl.tex",
285285
"google-cloud-automl Documentation",
286286
author,
@@ -314,13 +314,7 @@
314314
# One entry per manual page. List of tuples
315315
# (source start file, name, description, authors, manual section).
316316
man_pages = [
317-
(
318-
master_doc,
319-
"google-cloud-automl",
320-
"google-cloud-automl Documentation",
321-
[author],
322-
1,
323-
)
317+
(root_doc, "google-cloud-automl", "google-cloud-automl Documentation", [author], 1,)
324318
]
325319

326320
# If true, show URL addresses after external links.
@@ -334,7 +328,7 @@
334328
# dir menu entry, description, category)
335329
texinfo_documents = [
336330
(
337-
master_doc,
331+
root_doc,
338332
"google-cloud-automl",
339333
"google-cloud-automl Documentation",
340334
author,

owlbot.py

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,63 @@
6767
system_test_extras=["pandas", "storage"]
6868
)
6969

70+
s.move(templated_files)
71+
7072
python.py_samples(skip_readmes=True)
7173

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

74128
# This is being added to AutoML because the proto comments are long and
75129
# regex replaces are a brittle temporary solution.

0 commit comments

Comments
 (0)