diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9ce8396fe0..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 - digest: sha256:82d046d572a11b84d64d4b9af93ad55a1b6a4854917504ba7557acdfce907dde + image: gcr.io/repo-automation-bots/owlbot-python:latest + digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d 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/.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 -------------------