Skip to content
Browse files
docs: migrate links in CONTRIBUTING.rst from master to main (#58)
* docs: migrate default branch from master to main

* fix

* move comment
  • Loading branch information
parthea committed Aug 19, 2021
1 parent 955d707 commit 98c4177b4cdeb4cc6ad2ac947bff0bb22df578a6
Showing with 52 additions and 9 deletions.
  1. +1 −1 .kokoro/
  2. +1 −1 .kokoro/
  3. +6 −6 CONTRIBUTING.rst
  4. +44 −1
@@ -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
# See
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then
cleanup() {
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
@@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do

# If this is a periodic build, send the test log to the FlakyBot.
# See
# See
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
@@ -50,9 +50,9 @@ You'll have to create a development environment using a Git checkout:
# Configure remotes such that you can pull changes from the googleapis/python-service-control
# repository into your local repository.
$ git remote add upstream
# fetch and merge changes from upstream into master
# fetch and merge changes from upstream into main
$ git fetch upstream
$ git merge upstream/master
$ git merge upstream/main

Now your local repo is set up such that you will push changes to your GitHub
repo, from which you can submit a pull request.
@@ -110,12 +110,12 @@ Coding Style


By doing this, you are specifying the location of the most up-to-date
version of ``python-service-control``. The the suggested remote name ``upstream``
should point to the official ``googleapis`` checkout and the
the branch should be the main branch on that remote (``master``).
the branch should be the main branch on that remote (``main``).

- This repository contains configuration for the
`pre-commit <>`__ tool, which automates checking
@@ -209,7 +209,7 @@ The `description on PyPI`_ for the project comes directly from the
``README``. Due to the reStructuredText (``rst``) parser used by
PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst``
instead of
may cause problems creating links or rendering the description.

.. _description on PyPI:
@@ -234,7 +234,7 @@ We support:

Supported versions can be found in our ```` `config`_.

.. _config:
.. _config:

We also explicitly decided to support Python 3 beginning with version 3.6.
@@ -41,12 +41,55 @@
# ----------------------------------------------------------------------------

templated_files = common.py_library(cov_level=99, microgenerator=True)

# the microgenerator has a good coveragerc file
excludes = [".coveragerc"]
templated_files, excludes=excludes


# Remove the replacements below once 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")

# Customize CONTRIBUTING.rst to replace master with main
"fetch and merge changes from upstream into master",
"fetch and merge changes from upstream into main",

"git merge upstream/master",
"git merge upstream/main",

"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",

"remote \(``master``\)",
"remote (``main``)",


)["nox", "-s", "blacken"], hide_output=False)

0 comments on commit 98c4177

Please sign in to comment.