Skip to content

Commit

Permalink
chore: migrate to main branch (#239)
Browse files Browse the repository at this point in the history
Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
- [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-dlp/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
- [ ] Ensure the tests and linter pass
- [ ] Code coverage does not decrease (if any source code was changed)
- [ ] Appropriate docs were updated (if necessary)

Fixes #238  🦕
  • Loading branch information
dandhlee committed Aug 27, 2021
1 parent 851d09a commit 4b1a474
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 17 deletions.
8 changes: 4 additions & 4 deletions packages/google-cloud-dlp/.github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# https://github.com/googleapis/repo-automation-bots/tree/master/packages/sync-repo-settings
# Rules for master branch protection
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings
# Rules for main branch protection
branchProtectionRules:
# Identifies the protection rule pattern. Name of the branch to be protected.
# Defaults to `master`
- pattern: master
# Defaults to `main`
- pattern: main
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: true
requiredStatusCheckContexts:
Expand Down
2 changes: 1 addition & 1 deletion packages/google-cloud-dlp/.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 packages/google-cloud-dlp/.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
12 changes: 6 additions & 6 deletions packages/google-cloud-dlp/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-dlp
# repository into your local repository.
$ git remote add upstream git@github.com:googleapis/python-dlp.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-dlp``. 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-dlp/blob/master/CONTRIBUTING.rst``)
``https://github.com/googleapis/python-dlp/blob/main/CONTRIBUTING.rst``)
may cause problems creating links or rendering the description.

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

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

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


We also explicitly decided to support Python 3 beginning with version 3.6.
Expand Down
10 changes: 5 additions & 5 deletions packages/google-cloud-dlp/docs/conf.py
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-dlp"
Expand Down Expand Up @@ -280,7 +280,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(
master_doc,
root_doc,
"google-cloud-dlp.tex",
"google-cloud-dlp 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-dlp", "google-cloud-dlp Documentation", [author], 1,)
(root_doc, "google-cloud-dlp", "google-cloud-dlp 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-dlp",
"google-cloud-dlp Documentation",
author,
Expand Down
41 changes: 41 additions & 0 deletions packages/google-cloud-dlp/owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,44 @@
s.replace("noxfile.py", '[\"\']-W[\"\']', '# "-W"')

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

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

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

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

s.replace(
"docs/conf.py",
"master",
"main"
)

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

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

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

1 change: 1 addition & 0 deletions packages/google-cloud-dlp/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
"proto-plus >= 0.4.0",
"packaging >= 14.3",
"pytz >= 2021.1",
]

extras = {"libcst": "libcst >= 0.2.5"}
Expand Down

0 comments on commit 4b1a474

Please sign in to comment.