Skip to content

Commit 951e5fc

Browse files
author
Jim Fulton
committed
chore: migrate default branch from master to main
1 parent 9b5b002 commit 951e5fc

File tree

4 files changed

+51
-8
lines changed

4 files changed

+51
-8
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-bigquery-sqlalchemy
5151
# repository into your local repository.
5252
$ git remote add upstream git@github.com:googleapis/python-bigquery-sqlalchemy.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-sqlalchemy``. 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-sqlalchemy/blob/master/CONTRIBUTING.rst``)
212+
``https://github.com/googleapis/python-bigquery-sqlalchemy/blob/main/CONTRIBUTING.rst``)
213213
may cause problems creating links or rendering the description.
214214

215215
.. _description on PyPI: https://pypi.org/project/sqlalchemy-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-sqlalchemy/blob/master/noxfile.py
237+
.. _config: https://github.com/googleapis/python-bigquery-sqlalchemy/blob/main/noxfile.py
238238

239239

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

owlbot.py

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,49 @@ def compliance(session):
195195

196196
python.py_samples(skip_readmes=True)
197197

198+
# ----------------------------------------------------------------------------
199+
# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged
200+
201+
# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
202+
s.replace(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main")
203+
204+
# Customize CONTRIBUTING.rst to replace master with main
205+
s.replace(
206+
"CONTRIBUTING.rst",
207+
"fetch and merge changes from upstream into master",
208+
"fetch and merge changes from upstream into main",
209+
)
210+
211+
s.replace(
212+
"CONTRIBUTING.rst",
213+
"git merge upstream/master",
214+
"git merge upstream/main",
215+
)
216+
217+
s.replace(
218+
"CONTRIBUTING.rst",
219+
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
220+
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
221+
)
222+
223+
s.replace(
224+
"CONTRIBUTING.rst",
225+
"remote \(``master``\)",
226+
"remote (``main``)",
227+
)
228+
229+
s.replace(
230+
"CONTRIBUTING.rst",
231+
"blob/master/CONTRIBUTING.rst",
232+
"blob/main/CONTRIBUTING.rst",
233+
)
234+
235+
s.replace(
236+
"CONTRIBUTING.rst",
237+
"blob/master/noxfile.py",
238+
"blob/main/noxfile.py",
239+
)
240+
198241
# ----------------------------------------------------------------------------
199242
# Final cleanup
200243
# ----------------------------------------------------------------------------

0 commit comments

Comments
 (0)