Skip to content

Commit 8a83fcb

Browse files
chore(python): rename default branch to main (#213)
1 parent 4ab4d8a commit 8a83fcb

File tree

3 files changed

+4
-51
lines changed

3 files changed

+4
-51
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-cloud-videointelligence/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-videointelligence``. 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-videointelligence``. 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-cloud-videointelligence/owlbot.py

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -51,51 +51,4 @@
5151
# ----------------------------------------------------------------------------
5252
python.py_samples()
5353

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

0 commit comments

Comments
 (0)