Skip to content

Commit 8281174

Browse files
chore(python): rename default branch to main (#128)
1 parent 90d0184 commit 8281174

File tree

4 files changed

+11
-39
lines changed

4 files changed

+11
-39
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-trace/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-trace``. 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-trace``. 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-trace/docs/conf.py

Lines 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-trace"
@@ -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-trace.tex",
285285
"google-cloud-trace Documentation",
286286
author,
@@ -314,7 +314,7 @@
314314
# One entry per manual page. List of tuples
315315
# (source start file, name, description, authors, manual section).
316316
man_pages = [
317-
(master_doc, "google-cloud-trace", "google-cloud-trace Documentation", [author], 1,)
317+
(root_doc, "google-cloud-trace", "google-cloud-trace Documentation", [author], 1,)
318318
]
319319

320320
# If true, show URL addresses after external links.
@@ -328,7 +328,7 @@
328328
# dir menu entry, description, category)
329329
texinfo_documents = [
330330
(
331-
master_doc,
331+
root_doc,
332332
"google-cloud-trace",
333333
"google-cloud-trace Documentation",
334334
author,

packages/google-cloud-trace/owlbot.py

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,36 +43,8 @@
4343
cov_level=98,
4444
)
4545

46-
python.py_samples(skip_readmes=True)
47-
4846
s.move(templated_files, excludes=[".coveragerc"]) # microgenerator has a good .coveragerc file
49-
s.shell.run(["nox", "-s", "blacken"], hide_output=False)
50-
51-
# ----------------------------------------------------------------------------
52-
# Main Branch migration
53-
# ----------------------------------------------------------------------------
54-
55-
s.replace(
56-
"*.rst",
57-
"master",
58-
"main"
59-
)
6047

61-
s.replace(
62-
"*.rst",
63-
"google-cloud-python/blob/main",
64-
"google-cloud-python/blob/master"
65-
)
66-
67-
s.replace(
68-
"CONTRIBUTING.rst",
69-
"kubernetes/community/blob/main",
70-
"kubernetes/community/blob/master"
71-
)
72-
73-
s.replace(
74-
".kokoro/*",
75-
"master",
76-
"main"
77-
)
48+
python.py_samples(skip_readmes=True)
7849

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

0 commit comments

Comments
 (0)