Skip to content

Commit

Permalink
chore: migrate default branch from master to main (#153)
Browse files Browse the repository at this point in the history
* chore: migrate default branch from master to main

* Blacken owlbot.py

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
plamut and gcf-owl-bot[bot] authored Aug 26, 2021
1 parent 02d02c9 commit c7aa714
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 17 deletions.
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
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-bigquery-reservation/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-bigquery-reservation
# repository into your local repository.
$ git remote add upstream git@github.com:googleapis/python-bigquery-reservation.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-bigquery-reservation``. 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-bigquery-reservation/blob/master/CONTRIBUTING.rst``)
``https://github.com/googleapis/python-bigquery-reservation/blob/main/CONTRIBUTING.rst``)
may cause problems creating links or rendering the description.

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

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

.. _config: https://github.com/googleapis/python-bigquery-reservation/blob/master/noxfile.py
.. _config: https://github.com/googleapis/python-bigquery-reservation/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-bigquery-reservation/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 root toctree document.
root_doc = "index"

# General information about the project.
project = "google-cloud-bigquery-reservation"
Expand Down Expand Up @@ -280,7 +280,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(
master_doc,
root_doc,
"google-cloud-bigquery-reservation.tex",
"google-cloud-bigquery-reservation Documentation",
author,
Expand Down Expand Up @@ -315,7 +315,7 @@
# (source start file, name, description, authors, manual section).
man_pages = [
(
master_doc,
root_doc,
"google-cloud-bigquery-reservation",
"google-cloud-bigquery-reservation Documentation",
[author],
Expand All @@ -334,7 +334,7 @@
# dir menu entry, description, category)
texinfo_documents = [
(
master_doc,
root_doc,
"google-cloud-bigquery-reservation",
"google-cloud-bigquery-reservation Documentation",
author,
Expand Down
51 changes: 49 additions & 2 deletions packages/google-cloud-bigquery-reservation/owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@
for library in s.get_staging_dirs(default_version):
s.replace(
[
library / "google/cloud/bigquery_reservation_v1/services/reservation_service/client.py",
library / "google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py",
library
/ "google/cloud/bigquery_reservation_v1/services/reservation_service/client.py",
library
/ "google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py",
],
"assignee=organizations/456``",
"assignee=organizations/456``\n",
Expand All @@ -48,6 +50,51 @@
excludes=[".coveragerc"], # 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", r"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.",
)

# ----------------------------------------------------------------------------
# Samples templates
# ----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,17 @@ def location_path(project_id: str, location: str) -> str:


@pytest.fixture(scope="session", autouse=True)
def capacity_commitment(location_path: str, reservation_client: reservation_service.ReservationServiceClient) -> reservation_types.CapacityCommitment:
def capacity_commitment(
location_path: str, reservation_client: reservation_service.ReservationServiceClient
) -> reservation_types.CapacityCommitment:
# TODO(b/196082966): If custom names or creation date property are added,
# do pre-test cleanup of past commitments.
commitment = reservation_types.CapacityCommitment()
commitment.slot_count = 100
commitment.plan = reservation_types.CapacityCommitment.CommitmentPlan.FLEX
commitment = reservation_client.create_capacity_commitment(parent=location_path, capacity_commitment=commitment)
commitment = reservation_client.create_capacity_commitment(
parent=location_path, capacity_commitment=commitment
)
yield commitment
# Commitments can only be removed after 1 minute.
now = datetime.datetime.now(datetime.timezone.utc)
Expand Down

0 comments on commit c7aa714

Please sign in to comment.