Skip to content
This repository was archived by the owner on Jul 6, 2023. It is now read-only.

chore: migrate to main branch #34

Merged
parthea merged 4 commits into from
Aug 25, 2021
Merged

chore: migrate to main branch #34

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
844c24e
docs: migrate to main branch
dandhlee Aug 24, 2021
a210a3d
🦉 Updates from OwlBot
gcf-owl-bot[bot] Aug 24, 2021
9d56de2
chore: update owlbot
dandhlee Aug 24, 2021
785409b
🦉 Updates from OwlBot
gcf-owl-bot[bot] Aug 24, 2021
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
Prev Previous commit
Next Next commit
🦉 Updates from OwlBot 
See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] committed Aug 24, 2021
commit a210a3d2d2b7848e7f8247e6b5466d932c4ea407
2 changes: 1 addition & 1 deletion .kokoro/build.sh
View file
Open in desktop
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
View file
Open in desktop
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
12 changes: 6 additions & 6 deletions CONTRIBUTING.rst
View file
Open in desktop
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-dms
# repository into your local repository.
$ git remote add upstream git@github.com:googleapis/python-dms.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-dms``. 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-dms/blob/master/CONTRIBUTING.rst``)
``https://github.com/googleapis/python-dms/blob/main/CONTRIBUTING.rst``)
may cause problems creating links or rendering the description.

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

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

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


We also explicitly decided to support Python 3 beginning with version 3.6.
Expand Down
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Python Client for Cloud Database Migration Service
- `Product Documentation`_

.. |ga| image:: https://img.shields.io/badge/support-ga-gold.svg
:target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#ga-support
:target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#ga-support
Copy link
Copy Markdown
Contributor

@parthea parthea Aug 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I get 404 with the new link

Copy link
Copy Markdown
Contributor Author

@dandhlee dandhlee Aug 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

.. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dms.svg
:target: https://pypi.org/project/google-cloud-dms/
.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dms.svg
Expand Down Expand Up @@ -79,4 +79,4 @@ Next Steps
APIs that we cover.

.. _Cloud Database Migration Service Product documentation: https://cloud.google.com/database-migration/
.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst
.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst
10 changes: 5 additions & 5 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
# The encoding of source files.
# source_encoding = 'utf-8-sig'

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

# General information about the project.
project = "google-cloud-dms"
Expand Down Expand Up @@ -280,7 +280,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(
master_doc,
root_doc,
"google-cloud-dms.tex",
"google-cloud-dms Documentation",
author,
Expand Down Expand Up @@ -314,7 +314,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, "google-cloud-dms", "google-cloud-dms Documentation", [author], 1,)
(root_doc, "google-cloud-dms", "google-cloud-dms Documentation", [author], 1,)
]

# If true, show URL addresses after external links.
Expand All @@ -328,7 +328,7 @@
# dir menu entry, description, category)
texinfo_documents = [
(
master_doc,
root_doc,
"google-cloud-dms",
"google-cloud-dms Documentation",
author,
Expand Down