Skip to content

Commit 75eaa73

Browse files
chore(python): rename default branch to main (#91)
1 parent 301a88f commit 75eaa73

File tree

3 files changed

+6
-58
lines changed

3 files changed

+6
-58
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-video-transcoder/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-video-transcoder``. 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-video-transcoder``. 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-video-transcoder/owlbot.py

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -48,63 +48,11 @@
4848
# Add templated files
4949
# ----------------------------------------------------------------------------
5050
templated_files = common.py_library(cov_level=99, microgenerator=True)
51-
python.py_samples(skip_readmes=True)
51+
5252
s.move(
5353
templated_files, excludes=[".coveragerc"]
5454
) # the microgenerator has a good coveragerc file
55-
# Remove the replacements below once 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(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main")
59-
60-
# Customize CONTRIBUTING.rst to replace master with main
61-
s.replace(
62-
"CONTRIBUTING.rst",
63-
"fetch and merge changes from upstream into master",
64-
"fetch and merge changes from upstream into main",
65-
)
66-
67-
s.replace(
68-
"CONTRIBUTING.rst",
69-
"git merge upstream/master",
70-
"git merge upstream/main",
71-
)
72-
73-
s.replace(
74-
"CONTRIBUTING.rst",
75-
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
76-
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
77-
)
78-
79-
s.replace(
80-
"CONTRIBUTING.rst",
81-
"remote \(``master``\)",
82-
"remote (``main``)",
83-
)
84-
85-
s.replace(
86-
"CONTRIBUTING.rst",
87-
"blob/master/CONTRIBUTING.rst",
88-
"blob/main/CONTRIBUTING.rst",
89-
)
90-
91-
s.replace(
92-
"CONTRIBUTING.rst",
93-
"blob/master/noxfile.py",
94-
"blob/main/noxfile.py",
95-
)
96-
97-
s.replace(
98-
"docs/conf.py",
99-
"master_doc",
100-
"root_doc",
101-
)
102-
103-
s.replace(
104-
"docs/conf.py",
105-
"# The master toctree document.",
106-
"# The root toctree document.",
107-
)
10855

56+
python.py_samples(skip_readmes=True)
10957

11058
s.shell.run(["nox", "-s", "blacken"], hide_output=False)

0 commit comments

Comments
 (0)