Skip to content

Commit 679e8ed

Browse files
chore: migrate default branch to main (#910)
* chore: migrate default branch to main * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Add owlbot replacements to persist changes * Manually apply new replacements from owlbot.py * Move temp replacement rules after s.move() Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent e2d12b7 commit 679e8ed

File tree

6 files changed

+65
-17
lines changed

6 files changed

+65
-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-bigquery
5151
# repository into your local repository.
5252
$ git remote add upstream [email protected]:googleapis/python-bigquery.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-bigquery``. 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-bigquery/blob/master/CONTRIBUTING.rst``)
212+
``https://github.com/googleapis/python-bigquery/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-bigquery
@@ -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-bigquery/blob/master/noxfile.py
237+
.. _config: https://github.com/googleapis/python-bigquery/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-bigquery"
@@ -281,7 +281,7 @@
281281
# author, documentclass [howto, manual, or own class]).
282282
latex_documents = [
283283
(
284-
master_doc,
284+
root_doc,
285285
"google-cloud-bigquery.tex",
286286
"google-cloud-bigquery Documentation",
287287
author,
@@ -316,7 +316,7 @@
316316
# (source start file, name, description, authors, manual section).
317317
man_pages = [
318318
(
319-
master_doc,
319+
root_doc,
320320
"google-cloud-bigquery",
321321
"google-cloud-bigquery Documentation",
322322
[author],
@@ -335,7 +335,7 @@
335335
# dir menu entry, description, category)
336336
texinfo_documents = [
337337
(
338-
master_doc,
338+
root_doc,
339339
"google-cloud-bigquery",
340340
"google-cloud-bigquery Documentation",
341341
author,

owlbot.py

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,52 @@
169169
),
170170
)
171171

172+
173+
# Remove the replacements below once
174+
# https://github.com/googleapis/synthtool/pull/1188 is merged
175+
176+
# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
177+
s.replace(
178+
".kokoro/*.sh",
179+
"repo-automation-bots/tree/master",
180+
"repo-automation-bots/tree/main",
181+
)
182+
183+
# Customize CONTRIBUTING.rst to replace master with main
184+
s.replace(
185+
"CONTRIBUTING.rst",
186+
"fetch and merge changes from upstream into master",
187+
"fetch and merge changes from upstream into main",
188+
)
189+
190+
s.replace(
191+
"CONTRIBUTING.rst", "git merge upstream/master", "git merge upstream/main",
192+
)
193+
194+
s.replace(
195+
"CONTRIBUTING.rst",
196+
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
197+
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
198+
)
199+
200+
s.replace(
201+
"CONTRIBUTING.rst", r"remote \(``master``\)", "remote (``main``)",
202+
)
203+
204+
s.replace(
205+
"CONTRIBUTING.rst", "blob/master/CONTRIBUTING.rst", "blob/main/CONTRIBUTING.rst",
206+
)
207+
208+
s.replace(
209+
"CONTRIBUTING.rst", "blob/master/noxfile.py", "blob/main/noxfile.py",
210+
)
211+
212+
s.replace(
213+
"docs/conf.py", "master_doc", "root_doc",
214+
)
215+
216+
s.replace(
217+
"docs/conf.py", "# The master toctree document.", "# The root toctree document.",
218+
)
219+
172220
s.shell.run(["nox", "-s", "blacken"], hide_output=False)

0 commit comments

Comments
 (0)