From 589dccbe9aa7bb2c4b1cc334c6e351044339346d Mon Sep 17 00:00:00 2001 From: Dan Lee Date: Mon, 30 Aug 2021 20:29:45 +0000 Subject: [PATCH 1/5] chore: migrate to main branch --- .../django_tests_against_emulator0.yml | 2 +- .../django_tests_against_emulator1.yml | 2 +- .../django_tests_against_emulator2.yml | 2 +- .../django_tests_against_emulator3.yml | 2 +- .../django_tests_against_emulator4.yml | 2 +- .../django_tests_against_emulator5.yml | 2 +- .../django_tests_against_emulator6.yml | 2 +- .../django_tests_against_emulator7.yml | 2 +- .../django_tests_against_emulator8.yml | 2 +- .../django_tests_against_emulator9.yml | 2 +- .../integration-tests-against-emulator.yml | 2 +- owlbot.py | 29 +++++++++++++++++++ 12 files changed, 40 insertions(+), 11 deletions(-) diff --git a/.github/workflows/django_tests_against_emulator0.yml b/.github/workflows/django_tests_against_emulator0.yml index 0f7f7c99db..2b31049e72 100644 --- a/.github/workflows/django_tests_against_emulator0.yml +++ b/.github/workflows/django_tests_against_emulator0.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests0 jobs: diff --git a/.github/workflows/django_tests_against_emulator1.yml b/.github/workflows/django_tests_against_emulator1.yml index 921a9a5848..722a593af1 100644 --- a/.github/workflows/django_tests_against_emulator1.yml +++ b/.github/workflows/django_tests_against_emulator1.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests1 jobs: diff --git a/.github/workflows/django_tests_against_emulator2.yml b/.github/workflows/django_tests_against_emulator2.yml index 682de38ed6..364803ab3a 100644 --- a/.github/workflows/django_tests_against_emulator2.yml +++ b/.github/workflows/django_tests_against_emulator2.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests2 jobs: diff --git a/.github/workflows/django_tests_against_emulator3.yml b/.github/workflows/django_tests_against_emulator3.yml index ea83185a82..9e2df8ae94 100644 --- a/.github/workflows/django_tests_against_emulator3.yml +++ b/.github/workflows/django_tests_against_emulator3.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests3 jobs: diff --git a/.github/workflows/django_tests_against_emulator4.yml b/.github/workflows/django_tests_against_emulator4.yml index 6a59ff7725..361dccfbc7 100644 --- a/.github/workflows/django_tests_against_emulator4.yml +++ b/.github/workflows/django_tests_against_emulator4.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests4 jobs: diff --git a/.github/workflows/django_tests_against_emulator5.yml b/.github/workflows/django_tests_against_emulator5.yml index f07609fb2f..817b0c4295 100644 --- a/.github/workflows/django_tests_against_emulator5.yml +++ b/.github/workflows/django_tests_against_emulator5.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests5 jobs: diff --git a/.github/workflows/django_tests_against_emulator6.yml b/.github/workflows/django_tests_against_emulator6.yml index 3984852de2..ab9d817c98 100644 --- a/.github/workflows/django_tests_against_emulator6.yml +++ b/.github/workflows/django_tests_against_emulator6.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests6 jobs: diff --git a/.github/workflows/django_tests_against_emulator7.yml b/.github/workflows/django_tests_against_emulator7.yml index 0932197f86..4ee19f9373 100644 --- a/.github/workflows/django_tests_against_emulator7.yml +++ b/.github/workflows/django_tests_against_emulator7.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests7 jobs: diff --git a/.github/workflows/django_tests_against_emulator8.yml b/.github/workflows/django_tests_against_emulator8.yml index 98d4b5f1d8..5c148ddd23 100644 --- a/.github/workflows/django_tests_against_emulator8.yml +++ b/.github/workflows/django_tests_against_emulator8.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests8 jobs: diff --git a/.github/workflows/django_tests_against_emulator9.yml b/.github/workflows/django_tests_against_emulator9.yml index 0ba4baefce..4388c3cfa6 100644 --- a/.github/workflows/django_tests_against_emulator9.yml +++ b/.github/workflows/django_tests_against_emulator9.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: django-tests9 jobs: diff --git a/.github/workflows/integration-tests-against-emulator.yml b/.github/workflows/integration-tests-against-emulator.yml index efd2c4e5bb..5767e966bb 100644 --- a/.github/workflows/integration-tests-against-emulator.yml +++ b/.github/workflows/integration-tests-against-emulator.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: Run Django Spanner integration tests against emulator jobs: diff --git a/owlbot.py b/owlbot.py index d0087b4c0b..ed7096fde4 100644 --- a/owlbot.py +++ b/owlbot.py @@ -40,3 +40,32 @@ ) 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" +) + From 65be67d3769b8740f531b7d4fc7ae7b982e9b1d0 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 30 Aug 2021 20:31:18 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .kokoro/test-samples-impl.sh | 2 +- README.rst | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.kokoro/test-samples-impl.sh b/.kokoro/test-samples-impl.sh index ac70148661..595dca8b0d 100755 --- a/.kokoro/test-samples-impl.sh +++ b/.kokoro/test-samples-impl.sh @@ -72,7 +72,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 diff --git a/README.rst b/README.rst index 637ffe6c7e..62739a3182 100644 --- a/README.rst +++ b/README.rst @@ -220,13 +220,13 @@ How it works Overall design ~~~~~~~~~~~~~~ -.. figure:: https://raw.githubusercontent.com/googleapis/python-spanner-django/master/assets/overview.png +.. figure:: https://raw.githubusercontent.com/googleapis/python-spanner-django/main/assets/overview.png :alt: "Overall Design" Internals ~~~~~~~~~ -.. figure:: https://raw.githubusercontent.com/googleapis/python-spanner-django/master/assets/internals.png +.. figure:: https://raw.githubusercontent.com/googleapis/python-spanner-django/main/assets/internals.png :alt: "Internals" @@ -247,11 +247,11 @@ HOW TO CONTRIBUTE Contributions to this library are always welcome and highly encouraged. -See `CONTRIBUTING `_ for more information on how to get started. +See `CONTRIBUTING `_ for more information on how to get started. Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See the `Code -of Conduct `_ for more information. +of Conduct `_ for more information. Current limitations ------------------- From 60347fab8eb86b21b0ec347202a138e46605ffc9 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Thu, 2 Sep 2021 00:19:22 +0000 Subject: [PATCH 3/5] use latest post processor image --- .github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9ce8396fe0..8bf0281c81 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -6,4 +6,4 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:82d046d572a11b84d64d4b9af93ad55a1b6a4854917504ba7557acdfce907dde + digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d From 2bb65c182cb9a40623b256dc953215284414199a Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 1 Sep 2021 20:20:10 -0400 Subject: [PATCH 4/5] remove obsolete replacements in owlbot.py --- owlbot.py | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/owlbot.py b/owlbot.py index ed7096fde4..d0087b4c0b 100644 --- a/owlbot.py +++ b/owlbot.py @@ -40,32 +40,3 @@ ) 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" -) - From 11f2f07e6e393173188ffa0dc85e839935cb64d0 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Thu, 2 Sep 2021 00:23:23 +0000 Subject: [PATCH 5/5] update post processor image --- .github/.OwlBot.lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 8bf0281c81..cd8bc8740c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -5,5 +5,5 @@ # https://developers.google.com/open-source/licenses/bsd docker: - image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest + image: gcr.io/repo-automation-bots/owlbot-python:latest digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d