Skip to content

Commit cc8deef

Browse files
chore(python): rename default branch to main (#128)
* chore(python): rename default branch to main Source-Link: googleapis/synthtool@5c0fa62 Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d * chore: remove obsolete replacements in owlbot.py Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Nick Cain <[email protected]>
1 parent 60ab92c commit cc8deef

File tree

3 files changed

+4
-57
lines changed

3 files changed

+4
-57
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
22
image: gcr.io/repo-automation-bots/owlbot-python:latest
3-
digest: sha256:1456ea2b3b523ccff5e13030acef56d1de28f21249c62aa0f196265880338fa7
3+
digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d

packages/google-analytics-admin/CONTRIBUTING.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ Coding Style
113113
export GOOGLE_CLOUD_TESTING_BRANCH="main"
114114

115115
By doing this, you are specifying the location of the most up-to-date
116-
version of ``python-analytics-admin``. The the suggested remote name ``upstream``
117-
should point to the official ``googleapis`` checkout and the
118-
the branch should be the main branch on that remote (``main``).
116+
version of ``python-analytics-admin``. The
117+
remote name ``upstream`` should point to the official ``googleapis``
118+
checkout and the branch should be the default branch on that remote (``main``).
119119

120120
- This repository contains configuration for the
121121
`pre-commit <https://pre-commit.com/>`__ tool, which automates checking

packages/google-analytics-admin/owlbot.py

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -38,59 +38,6 @@
3838
".coveragerc"
3939
]
4040
) # the microgenerator has a good coveragerc file
41-
# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged
42-
43-
# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
44-
s.replace(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main")
45-
46-
# Customize CONTRIBUTING.rst to replace master with main
47-
s.replace(
48-
"CONTRIBUTING.rst",
49-
"fetch and merge changes from upstream into master",
50-
"fetch and merge changes from upstream into main",
51-
)
52-
53-
s.replace(
54-
"CONTRIBUTING.rst",
55-
"git merge upstream/master",
56-
"git merge upstream/main",
57-
)
58-
59-
s.replace(
60-
"CONTRIBUTING.rst",
61-
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
62-
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
63-
)
64-
65-
s.replace(
66-
"CONTRIBUTING.rst",
67-
"remote \(``master``\)",
68-
"remote (``main``)",
69-
)
70-
71-
s.replace(
72-
"CONTRIBUTING.rst",
73-
"blob/master/CONTRIBUTING.rst",
74-
"blob/main/CONTRIBUTING.rst",
75-
)
76-
77-
s.replace(
78-
"CONTRIBUTING.rst",
79-
"blob/master/noxfile.py",
80-
"blob/main/noxfile.py",
81-
)
82-
83-
s.replace(
84-
"docs/conf.py",
85-
"master_doc",
86-
"root_doc",
87-
)
88-
89-
s.replace(
90-
"docs/conf.py",
91-
"# The master toctree document.",
92-
"# The root toctree document.",
93-
)
9441

9542
# fix coverage statement
9643
s.replace("noxfile.py",

0 commit comments

Comments
 (0)