Skip to content

Commit

Permalink
chore: removing owlbot directives for conversion to main (#680)
Browse files Browse the repository at this point in the history
chore: removing owlbot directives for conversion to main
  • Loading branch information
nicain committed Sep 2, 2021
1 parent 12ca245 commit af809b0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
image: gcr.io/repo-automation-bots/owlbot-python:latest
digest: sha256:1456ea2b3b523ccff5e13030acef56d1de28f21249c62aa0f196265880338fa7
digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d
6 changes: 3 additions & 3 deletions CONTRIBUTING.rst
Expand Up @@ -113,9 +113,9 @@ Coding Style
export GOOGLE_CLOUD_TESTING_BRANCH="main"

By doing this, you are specifying the location of the most up-to-date
version of ``python-aiplatform``. 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 (``main``).
version of ``python-aiplatform``. The
remote name ``upstream`` should point to the official ``googleapis``
checkout and the branch should be the default branch on that remote (``main``).

- This repository contains configuration for the
`pre-commit <https://pre-commit.com/>`__ tool, which automates checking
Expand Down
53 changes: 0 additions & 53 deletions owlbot.py
Expand Up @@ -90,59 +90,6 @@
".kokoro/**/*.cfg"
]
) # the microgenerator has a good coveragerc file
# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 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
s.replace(
"CONTRIBUTING.rst",
"fetch and merge changes from upstream into master",
"fetch and merge changes from upstream into main",
)

s.replace(
"CONTRIBUTING.rst",
"git merge upstream/master",
"git merge upstream/main",
)

s.replace(
"CONTRIBUTING.rst",
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""",
"""export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""",
)

s.replace(
"CONTRIBUTING.rst",
"remote \(``master``\)",
"remote (``main``)",
)

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

s.replace(
"CONTRIBUTING.rst",
"blob/master/noxfile.py",
"blob/main/noxfile.py",
)

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

s.replace(
"**/docs/conf.py",
"# The master toctree document.",
"# The root toctree document.",
)

# Update samples config to use `ucaip-sample-tests` project
s.replace(".kokoro/samples/python3.*/common.cfg",
Expand Down

0 comments on commit af809b0

Please sign in to comment.