Skip to content

Commit

Permalink
chore: migrate default branch from master to main (#260)
Browse files Browse the repository at this point in the history
  • Loading branch information
parthea committed Aug 27, 2021
1 parent fcc24fc commit 4e45fc3
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ python3 -m pip install --upgrade --quiet nox
python3 -m nox --version

# If this is a continuous build, send the test log to the FlakyBot.
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
cleanup() {
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/test-samples-impl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do
EXIT=$?

# If this is a periodic build, send the test log to the FlakyBot.
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
$KOKORO_GFILE_DIR/linux_amd64/flakybot
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ might break the hypothetical usecase of downloading a blob marked with
- Modify file not found test to look for the correct error message
- Harden tests so they can run with debug logging statements
- Add Appveyor support. ([#40](https://github.com/googleapis/google-resumable-media-python/pull/40))
- Mark the version in `master` as `.dev1`.
- Mark the version in `main` as `.dev1`.


## 0.3.1
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ License

Apache 2.0 - See `the LICENSE`_ for more information.

.. _the LICENSE: https://github.com/googleapis/google-resumable-media-python/blob/master/LICENSE
.. _the LICENSE: https://github.com/googleapis/google-resumable-media-python/blob/main/LICENSE
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# source_encoding = 'utf-8-sig'

# The main toctree document.
master_doc = "index"
root_doc = "index"

# General information about the project.
project = u"google-resumable-media"
Expand Down Expand Up @@ -266,7 +266,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(
master_doc,
root_doc,
"google-resumable-media.tex",
u"google-resumable-media Documentation",
author,
Expand Down Expand Up @@ -301,7 +301,7 @@
# (source start file, name, description, authors, manual section).
man_pages = [
(
master_doc,
root_doc,
"google-resumable-media",
u"google-resumable-media Documentation",
[author],
Expand All @@ -320,7 +320,7 @@
# dir menu entry, description, category)
texinfo_documents = [
(
master_doc,
root_doc,
"google-resumable-media",
u"google-resumable-media Documentation",
author,
Expand Down
12 changes: 12 additions & 0 deletions owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,16 @@
r'value: "docs-staging-v2-staging"'
)


# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged

# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files
s.replace(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main")

s.replace(
"docs/conf.py",
"master_doc",
"root_doc",
)

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

0 comments on commit 4e45fc3

Please sign in to comment.