Skip to content

Commit

Permalink
chore: migrate to main branch (#242)
Browse files Browse the repository at this point in the history
  • Loading branch information
dandhlee authored Aug 30, 2021
1 parent c783481 commit 874d8b1
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
12 changes: 6 additions & 6 deletions packages/google-cloud-python-speech/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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-speech
# repository into your local repository.
$ git remote add upstream git@github.com:googleapis/python-speech.git
# 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.
Expand Down Expand Up @@ -110,12 +110,12 @@ Coding Style
variables::

export GOOGLE_CLOUD_TESTING_REMOTE="upstream"
export GOOGLE_CLOUD_TESTING_BRANCH="master"
export GOOGLE_CLOUD_TESTING_BRANCH="main"

By doing this, you are specifying the location of the most up-to-date
version of ``python-speech``. 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 <https://pre-commit.com/>`__ tool, which automates checking
Expand Down Expand Up @@ -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
``https://github.com/googleapis/python-speech/blob/master/CONTRIBUTING.rst``)
``https://github.com/googleapis/python-speech/blob/main/CONTRIBUTING.rst``)
may cause problems creating links or rendering the description.

.. _description on PyPI: https://pypi.org/project/google-cloud-speech
Expand All @@ -234,7 +234,7 @@ We support:

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

.. _config: https://github.com/googleapis/python-speech/blob/master/noxfile.py
.. _config: https://github.com/googleapis/python-speech/blob/main/noxfile.py


We also explicitly decided to support Python 3 beginning with version 3.6.
Expand Down
29 changes: 29 additions & 0 deletions packages/google-cloud-python-speech/owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,32 @@ class SpeechClient(SpeechHelpers, SpeechClient):
python.py_samples(skip_readmes=True)

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

# ----------------------------------------------------------------------------
# Main Branch migration
# ----------------------------------------------------------------------------

s.replace(
"*.rst",
"master",
"main"
)

s.replace(
"*.rst",
"google-cloud-python/blob/main",
"google-cloud-python/blob/master"
)

s.replace(
"CONTRIBUTING.rst",
"kubernetes/community/blob/main",
"kubernetes/community/blob/master"
)

s.replace(
".kokoro/*",
"master",
"main"
)

0 comments on commit 874d8b1

Please sign in to comment.