Skip to content
This repository was archived by the owner on Jul 6, 2023. It is now read-only.

Commit f48a13f

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(python): rename default branch to main (#39)
1 parent bd4fb14 commit f48a13f

3 files changed

Lines changed: 6 additions & 57 deletions

File tree

‎.github/.OwlBot.lock.yaml‎

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

‎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-service-usage``. 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-service-usage``. 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

‎owlbot.py‎

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -55,61 +55,10 @@
5555
# ----------------------------------------------------------------------------
5656

5757
templated_files = gcp.CommonTemplates().py_library(microgenerator=True)
58-
python.py_samples(skip_readmes=True)
59-
s.move(templated_files, excludes=[".coveragerc"]) # the microgenerator has a good coveragerc file
60-
# Remove the replacements below once 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(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main")
64-
65-
# Customize CONTRIBUTING.rst to replace master with main
66-
s.replace(
67-
"CONTRIBUTING.rst",
68-
"fetch and merge changes from upstream into master",
69-
"fetch and merge changes from upstream into main",
70-
)
71-
72-
s.replace(
73-
"CONTRIBUTING.rst",
74-
"git merge upstream/master",
75-
"git merge upstream/main",
76-
)
77-
78-
s.replace(
79-
"CONTRIBUTING.rst",
80-
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
81-
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
82-
)
8358

84-
s.replace(
85-
"CONTRIBUTING.rst",
86-
"remote \(``master``\)",
87-
"remote (``main``)",
88-
)
89-
90-
s.replace(
91-
"CONTRIBUTING.rst",
92-
"blob/master/CONTRIBUTING.rst",
93-
"blob/main/CONTRIBUTING.rst",
94-
)
95-
96-
s.replace(
97-
"CONTRIBUTING.rst",
98-
"blob/master/noxfile.py",
99-
"blob/main/noxfile.py",
100-
)
101-
102-
s.replace(
103-
"docs/conf.py",
104-
"master_doc",
105-
"root_doc",
106-
)
59+
s.move(templated_files, excludes=[".coveragerc"]) # the microgenerator has a good coveragerc file
10760

108-
s.replace(
109-
"docs/conf.py",
110-
"# The master toctree document.",
111-
"# The root toctree document.",
112-
)
61+
python.py_samples(skip_readmes=True)
11362

11463
# ----------------------------------------------------------------------------
11564
# Run blacken session

0 commit comments

Comments
 (0)