Skip to content

Commit f6098f1

Browse files
committed
chore(django-spanner): stabilize Django 5.2 system tests and remove obsolete workflows
1 parent c54a68d commit f6098f1

File tree

12 files changed

+439
-133
lines changed

12 files changed

+439
-133
lines changed

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

packages/django-google-spanner/django_spanner/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
def gen_rand_int64():
5454
# Credit to https://stackoverflow.com/a/3530326.
5555
# Use 32-bit integer for Emulator compatibility (High-bit issues observed).
56-
return uuid4().int & 0xFFFFFFFF
56+
return uuid4().int & 0x7FFFFFFFFFFFFFFF
5757

5858

5959
def autofield_init(self, *args, **kwargs):

packages/django-google-spanner/django_spanner/base.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,10 @@ def instance(self):
132132

133133
if _SPANNER_CLIENT_CACHE is None:
134134
_SPANNER_CLIENT_CACHE = spanner.Client(
135-
project=os.environ["GOOGLE_CLOUD_PROJECT"]
135+
project=os.environ.get("GOOGLE_CLOUD_PROJECT")
136+
or self.settings_dict.get("project")
137+
or self.settings_dict.get("PROJECT")
138+
or "test-project"
136139
)
137140

138141
return _SPANNER_CLIENT_CACHE.instance(self.settings_dict["INSTANCE"])
@@ -155,7 +158,10 @@ def get_connection_params(self):
155158
in Django Spanner format.
156159
"""
157160
return {
158-
"project": os.environ["GOOGLE_CLOUD_PROJECT"],
161+
"project": os.environ.get("GOOGLE_CLOUD_PROJECT")
162+
or self.settings_dict.get("project")
163+
or self.settings_dict.get("PROJECT")
164+
or "test-project",
159165
"instance_id": self.settings_dict["INSTANCE"],
160166
"database_id": self.settings_dict["NAME"],
161167
"user_agent": "django_spanner/2.2.0a1",

0 commit comments

Comments
 (0)