Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Sep 5, 2023. It is now read-only.

Commit a5de4b6

Browse filesBrowse files
plamutplamut
authored
chore: migrate default branch from master to main (#212)
1 parent 729ee2f commit a5de4b6
Copy full SHA for a5de4b6

File tree

Expand file treeCollapse file tree

7 files changed

+65
-18
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+65
-18
lines changed

‎.github/sync-repo-settings.yaml

Copy file name to clipboardExpand all lines: .github/sync-repo-settings.yaml
+4-4Lines 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

Copy file name to clipboardExpand all lines: .kokoro/build.sh
+1-1Lines 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

Copy file name to clipboardExpand all lines: .kokoro/test-samples-impl.sh
+1-1Lines 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

‎CHANGELOG.md

Copy file name to clipboardExpand all lines: CHANGELOG.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100

101101
### ⚠ BREAKING CHANGES
102102

103-
* generate with microgenerator. See [Migration Guide](https://github.com/googleapis/python-securitycenter/blob/master/UPGRADING.md)(#49)
103+
* generate with microgenerator. See [Migration Guide](https://github.com/googleapis/python-securitycenter/blob/main/UPGRADING.md)(#49)
104104

105105
### Features
106106

‎CONTRIBUTING.rst

Copy file name to clipboardExpand all lines: CONTRIBUTING.rst
+6-6Lines 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-securitycenter
5151
# repository into your local repository.
5252
$ git remote add upstream git@github.com:googleapis/python-securitycenter.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-securitycenter``. 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-securitycenter/blob/master/CONTRIBUTING.rst``)
212+
``https://github.com/googleapis/python-securitycenter/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-securitycenter
@@ -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-securitycenter/blob/master/noxfile.py
237+
.. _config: https://github.com/googleapis/python-securitycenter/blob/main/noxfile.py
238238

239239

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

‎docs/conf.py

Copy file name to clipboardExpand all lines: docs/conf.py
+5-5Lines 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-securitycenter"
@@ -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-securitycenter.tex",
285285
"google-cloud-securitycenter Documentation",
286286
author,
@@ -315,7 +315,7 @@
315315
# (source start file, name, description, authors, manual section).
316316
man_pages = [
317317
(
318-
master_doc,
318+
root_doc,
319319
"google-cloud-securitycenter",
320320
"google-cloud-securitycenter Documentation",
321321
[author],
@@ -334,7 +334,7 @@
334334
# dir menu entry, description, category)
335335
texinfo_documents = [
336336
(
337-
master_doc,
337+
root_doc,
338338
"google-cloud-securitycenter",
339339
"google-cloud-securitycenter Documentation",
340340
author,

‎owlbot.py

Copy file name to clipboardExpand all lines: owlbot.py
+47Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,51 @@
5656

5757
python.py_samples(skip_readmes=True)
5858

59+
# Remove the replacements below once
60+
# https://github.com/googleapis/synthtool/pull/1188 is merged
61+
62+
# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
63+
s.replace(
64+
".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main"
65+
)
66+
67+
# Customize CONTRIBUTING.rst to replace master with main
68+
s.replace(
69+
"CONTRIBUTING.rst",
70+
"fetch and merge changes from upstream into master",
71+
"fetch and merge changes from upstream into main",
72+
)
73+
74+
s.replace(
75+
"CONTRIBUTING.rst",
76+
"git merge upstream/master",
77+
"git merge upstream/main",
78+
)
79+
80+
s.replace(
81+
"CONTRIBUTING.rst",
82+
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
83+
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
84+
)
85+
86+
s.replace(
87+
"CONTRIBUTING.rst",
88+
"remote \(``master``\)",
89+
"remote (``main``)",
90+
)
91+
92+
s.replace(
93+
"CONTRIBUTING.rst",
94+
"blob/master/CONTRIBUTING.rst",
95+
"blob/main/CONTRIBUTING.rst",
96+
)
97+
98+
s.replace(
99+
"CONTRIBUTING.rst",
100+
"blob/master/noxfile.py",
101+
"blob/main/noxfile.py",
102+
)
103+
104+
s.replace("docs/conf.py", "master", "root")
105+
59106
s.shell.run(["nox", "-s", "blacken"], hide_output=False)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.