More changes

googleapis · Apr 10, 2024 · 0dab318 · 0dab318
1 parent 966f374
commit 0dab318
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 29 deletions.
diff --git a/...kflows/django_tests_against_emulator0.yml → ...ows/django4.2_tests_against_emulator0.yml b/...kflows/django_tests_against_emulator0.yml → ...ows/django4.2_tests_against_emulator0.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests0
+name: django4.2-tests0
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator1.yml → ...ows/django4.2_tests_against_emulator1.yml b/...kflows/django_tests_against_emulator1.yml → ...ows/django4.2_tests_against_emulator1.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests1
+name: django4.2-tests1
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator2.yml → ...ows/django4.2_tests_against_emulator2.yml b/...kflows/django_tests_against_emulator2.yml → ...ows/django4.2_tests_against_emulator2.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests2
+name: django4.2-tests2
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator3.yml → ...ows/django4.2_tests_against_emulator3.yml b/...kflows/django_tests_against_emulator3.yml → ...ows/django4.2_tests_against_emulator3.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests3
+name: django4.2-tests3
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator4.yml → ...ows/django4.2_tests_against_emulator4.yml b/...kflows/django_tests_against_emulator4.yml → ...ows/django4.2_tests_against_emulator4.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests4
+name: django4.2-tests4
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator5.yml → ...ows/django4.2_tests_against_emulator5.yml b/...kflows/django_tests_against_emulator5.yml → ...ows/django4.2_tests_against_emulator5.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests5
+name: django4.2-tests5
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator6.yml → ...ows/django4.2_tests_against_emulator6.yml b/...kflows/django_tests_against_emulator6.yml → ...ows/django4.2_tests_against_emulator6.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests6
+name: django4.2-tests6
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator7.yml → ...ows/django4.2_tests_against_emulator7.yml b/...kflows/django_tests_against_emulator7.yml → ...ows/django4.2_tests_against_emulator7.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests7
+name: django4.2-tests7
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator8.yml → ...ows/django4.2_tests_against_emulator8.yml b/...kflows/django_tests_against_emulator8.yml → ...ows/django4.2_tests_against_emulator8.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests8
+name: django4.2-tests8
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/...kflows/django_tests_against_emulator9.yml → ...ows/django4.2_tests_against_emulator9.yml b/...kflows/django_tests_against_emulator9.yml → ...ows/django4.2_tests_against_emulator9.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: django-tests9
+name: django4.2-tests9
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.8
       - name: Run Django tests
-        run: sh django_test_suite.sh
+        run: sh django_test_suite_4.2.sh
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/.github/workflows/integration-tests-against-emulator-3.7.yml b/.github/workflows/integration-tests-against-emulator-3.7.yml
@@ -3,7 +3,7 @@ on:
     branches:
       - main
   pull_request:
-name: Run Django Spanner integration tests against emulator 3.7
+name: Run Django Spanner integration tests against emulator 3.8
 jobs:
   system-tests:
     runs-on: ubuntu-latest
@@ -18,14 +18,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Set up Python 3.7
+      - name: Set up Python 3.8
         uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install nox
         run: python -m pip install nox
       - name: Run nox
-        run: nox -s unit-3.7
+        run: nox -s unit-3.8
         env:
           SPANNER_EMULATOR_HOST: localhost:9010
           GOOGLE_CLOUD_PROJECT: emulator-test-project

diff --git a/django_spanner/features.py b/django_spanner/features.py
@@ -2088,7 +2088,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
             "auth_tests.test_models.UserWithPermTestCase.test_multiple_backends",  # noqa
             "auth_tests.test_models.UserWithPermTestCase.test_nonexistent_backend",  # noqa
             "auth_tests.test_models.UserWithPermTestCase.test_nonexistent_permission",  # noqa
-            "auth_tests.test_password_reset_timeout_days.DeprecationTests.test_timeout",  # noqa
             "auth_tests.test_remote_user.AllowAllUsersRemoteUserBackendTest.test_csrf_validation_passes_after_process_request_login",  # noqa
             "auth_tests.test_remote_user.CustomHeaderRemoteUserTest.test_csrf_validation_passes_after_process_request_login",  # noqa
             "auth_tests.test_remote_user.PersistentRemoteUserTest.test_csrf_validation_passes_after_process_request_login",  # noqa
@@ -2136,6 +2135,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
                 "constraints.tests.CheckConstraintTests.test_database_constraint_expressionwrapper",  # noqa
                 "defer_regress.tests.DeferAnnotateSelectRelatedTest.test_defer_annotate_select_related", # noqa
                 "queries.tests.Queries1Tests.test_ticket7098", # noqa
+                "auth_tests.test_password_reset_timeout_days.DeprecationTests.test_timeout",  # noqa
                 "constraints.tests.CheckConstraintTests.test_database_constraint_expression", # noqa
                 "queries.tests.Queries1Tests.test_order_by_raw_column_alias_warning", # noqa
                 "sitemaps_tests.test_http.HTTPSitemapTests.test_simple_sitemap_custom_index",  # noqa

diff --git a/django_test_suite.sh → django_test_suite_4.2.sh b/django_test_suite.sh → django_test_suite_4.2.sh
diff --git a/noxfile.py b/noxfile.py
@@ -26,7 +26,7 @@
 
 DEFAULT_PYTHON_VERSION = "3.8"
 SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
-UNIT_TEST_PYTHON_VERSIONS = ["3.8", "3.9"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
 
 CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
 
@@ -194,7 +194,7 @@ def docs(session):
         "sphinx==4.5.0",
         "alabaster",
         "recommonmark",
-        "django==2.2",
+        "django==3.2",
     )
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
@@ -231,7 +231,7 @@ def docfx(session):
         "gcp-sphinx-docfx-yaml",
         "alabaster",
         "recommonmark",
-        "django==2.2",
+        "django==3.2",
     )
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)

diff --git a/run_testing_worker.py b/run_testing_worker.py
@@ -71,7 +71,7 @@ def __exit__(self, exc, exc_value, traceback):
 
 with TestInstance() as instance_name:
     os.system(
-        """DJANGO_TEST_APPS="{apps}" SPANNER_TEST_INSTANCE={instance} bash ./django_test_suite.sh""".format(
+        """DJANGO_TEST_APPS="{apps}" SPANNER_TEST_INSTANCE={instance} bash ./django_test_suite_4.2.sh""".format(
             apps=" ".join(test_apps), instance=instance_name
         )
     )