Merge branch 'main' of https://github.com/asthamohta/python-spanner-d…

…jango into HEAD

.github/.OwlBot.lock.yaml

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,4 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:3abfa0f1886adaf0b83f07cb117b24a639ea1cb9cffe56d43280b977033563eb
+  digest: sha256:2f155882785883336b4468d5218db737bb1d10c9cea7cb62219ad16fe248c03c
+# created: 2023-11-29T14:54:29.548172703Z

.github/workflows/foreign_keys.yaml

@@ -0,0 +1,30 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+name: foreign-keys-test
+jobs:
+  system-tests:
+    runs-on: ubuntu-latest
+
+    services:
+      emulator-0:
+        image: gcr.io/cloud-spanner-emulator/emulator:latest
+        ports:
+          - 9010:9010
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+      - name: Run Django foreign key test
+        run: sh foreign_key_test.sh
+        env:
+          SPANNER_EMULATOR_HOST: localhost:9010
+          GOOGLE_CLOUD_PROJECT: emulator-test-project
+          GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true
+          SPANNER_TEST_INSTANCE: google-cloud-django-backend-tests

.github/workflows/integration-tests-against-emulator.yml → .github/workflows/integration-tests-against-emulator-3.7.yml

@@ -3,13 +3,10 @@ on:
     branches:
       - main
   pull_request:
-name: Run Django Spanner integration tests against emulator
+name: Run Django Spanner integration tests against emulator 3.7
 jobs:
   system-tests:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
 
     services:
       emulator:
@@ -21,14 +18,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python 3.7
         uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.7
       - name: Install nox
         run: python -m pip install nox
       - name: Run nox
-        run: nox
+        run: nox -s unit-3.7
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

.github/workflows/integration-tests-against-emulator-3.8.yml

@@ -0,0 +1,34 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+name: Run Django Spanner integration tests against emulator 3.8
+jobs:
+  system-tests:
+    runs-on: ubuntu-latest
+
+    services:
+      emulator:
+        image: gcr.io/cloud-spanner-emulator/emulator:latest
+        ports:
+          - 9010:9010
+          - 9020:9020
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+      - name: Install nox
+        run: python -m pip install nox
+      with:
+          python-version: 3.8
+      - name: Run nox
+        run: nox -s unit-3.8
+        env:
+          SPANNER_EMULATOR_HOST: localhost:9010
+          GOOGLE_CLOUD_PROJECT: emulator-test-project
+          GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true

.github/workflows/integration-tests-against-emulator-3.9.yml

@@ -0,0 +1,34 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+name: Run Django Spanner integration tests against emulator 3.9
+jobs:
+  system-tests:
+    runs-on: ubuntu-latest
+
+    services:
+      emulator:
+        image: gcr.io/cloud-spanner-emulator/emulator:latest
+        ports:
+          - 9010:9010
+          - 9020:9020
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+      - name: Install nox
+        run: python -m pip install nox
+      with:
+          python-version: 3.9
+      - name: Run nox
+        run: nox -s unit-3.9
+        env:
+          SPANNER_EMULATOR_HOST: localhost:9010
+          GOOGLE_CLOUD_PROJECT: emulator-test-project
+          GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE: true

.kokoro/docker/docs/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2020 Google LLC
+# Copyright 2023 Google LLC
 #
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file or at

.kokoro/populate-secrets.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2020 Google LLC
+# Copyright 2023 Google LLC
 #
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file or at

.kokoro/publish-docs.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2020 Google LLC
+# Copyright 2023 Google LLC
 #
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file or at

.kokoro/release.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2020 Google LLC
+# Copyright 2023 Google LLC
 #
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file or at

.kokoro/release/common.cfg

@@ -38,3 +38,12 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
 }
+
+# Store the packages we uploaded to PyPI.  That way, we have a record of exactly
+# what we published, which we can use to generate SBOMs and attestations.
+action {
+  define_artifacts {
+    regex: "github/python-spanner-django/**/*.tar.gz"
+    strip_prefix: "github/python-spanner-django"
+  }
+}

.kokoro/requirements.in

@@ -1,10 +1,10 @@
 gcp-docuploader
-gcp-releasetool
+gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x
 importlib-metadata
 typing-extensions
 twine
 wheel
 setuptools
-nox
+nox>=2022.11.21 # required to remove dependency on py
 charset-normalizer<3
 click<8.1.0