Skip to content

chore: migrate default branch from master to main #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ Contributions to this library are always welcome and highly encouraged.

See `CONTRIBUTING.rst`_ for more information on how to get started.

.. _CONTRIBUTING.rst: https://github.com/googleapis/google-auth-library-python/blob/master/CONTRIBUTING.rst
.. _CONTRIBUTING.rst: https://github.com/googleapis/google-auth-library-python/blob/main/CONTRIBUTING.rst

License
-------

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

.. _the LICENSE: https://github.com/googleapis/google-auth-library-python/blob/master/LICENSE
.. _the LICENSE: https://github.com/googleapis/google-auth-library-python/blob/main/LICENSE
16 changes: 5 additions & 11 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
#
# source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = "index"
# The root toctree document.
root_doc = "index"

# General information about the project.
project = "google-auth"
Expand Down Expand Up @@ -277,13 +277,7 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(
master_doc,
"google-auth.tex",
"google-auth Documentation",
"Google, Inc.",
"manual",
)
(root_doc, "google-auth.tex", "google-auth Documentation", "Google, Inc.", "manual")
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down Expand Up @@ -323,7 +317,7 @@

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [(master_doc, "google-auth", "google-auth Documentation", [author], 1)]
man_pages = [(root_doc, "google-auth", "google-auth Documentation", [author], 1)]

# If true, show URL addresses after external links.
#
Expand All @@ -337,7 +331,7 @@
# dir menu entry, description, category)
texinfo_documents = [
(
master_doc,
root_doc,
"google-auth",
"google-auth Documentation",
author,
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ google-auth is made available under the Apache License, Version 2.0. For more
details, see `LICENSE`_

.. _LICENSE:
https://github.com/GoogleCloudPlatform/google-auth-library-python/blob/master/LICENSE
https://github.com/GoogleCloudPlatform/google-auth-library-python/blob/main/LICENSE

Contributing
------------
Expand All @@ -71,4 +71,4 @@ We happily welcome contributions, please see our `contributing`_ documentation
for details.

.. _contributing:
https://github.com/GoogleCloudPlatform/google-auth-library-python/blob/master/CONTRIBUTING.rst
https://github.com/GoogleCloudPlatform/google-auth-library-python/blob/main/CONTRIBUTING.rst
5 changes: 5 additions & 0 deletions owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,9 @@
'value: "docs"',
)

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

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

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