Skip to content
This repository was archived by the owner on Mar 31, 2026. It is now read-only.

Commit 199df93

Browse files
asthamohtaasthamohta
committed
changes to json samples and linting
1 parent 6a941ef commit 199df93

File tree

8 files changed

+154
-115
lines changed

8 files changed

+154
-115
lines changed

‎samples/samples/autocommit.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@ def enable_autocommit_mode(instance_id, database_id):
4646

4747
if __name__ == "__main__":
4848
parser = argparse.ArgumentParser(
49-
description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter,
49+
description=__doc__,
50+
formatter_class=argparse.RawDescriptionHelpFormatter,
5051
)
5152
parser.add_argument("instance_id", help="Your Cloud Spanner instance ID.")
5253
parser.add_argument(
53-
"--database-id", help="Your Cloud Spanner database ID.", default="example_db",
54+
"--database-id",
55+
help="Your Cloud Spanner database ID.",
56+
default="example_db",
5457
)
5558
subparsers = parser.add_subparsers(dest="command")
5659
subparsers.add_parser("enable_autocommit_mode", help=enable_autocommit_mode.__doc__)

‎samples/samples/autocommit_test.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ def test_enable_autocommit_mode(capsys, instance_id, sample_database):
2525
op.result()
2626

2727
autocommit.enable_autocommit_mode(
28-
instance_id, sample_database.database_id,
28+
instance_id,
29+
sample_database.database_id,
2930
)
3031
out, _ = capsys.readouterr()
3132
assert "Autocommit mode is enabled." in out

‎samples/samples/backup_sample_test.py‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ def sample_name():
2626

2727

2828
def unique_database_id():
29-
""" Creates a unique id for the database. """
29+
"""Creates a unique id for the database."""
3030
return f"test-db-{uuid.uuid4().hex[:10]}"
3131

3232

3333
def unique_backup_id():
34-
""" Creates a unique id for the backup. """
34+
"""Creates a unique id for the backup."""
3535
return f"test-backup-{uuid.uuid4().hex[:10]}"
3636

3737

@@ -52,7 +52,10 @@ def test_create_backup(capsys, instance_id, sample_database):
5252
version_time = list(results)[0][0]
5353

5454
backup_sample.create_backup(
55-
instance_id, sample_database.database_id, BACKUP_ID, version_time,
55+
instance_id,
56+
sample_database.database_id,
57+
BACKUP_ID,
58+
version_time,
5659
)
5760
out, _ = capsys.readouterr()
5861
assert BACKUP_ID in out
@@ -74,10 +77,16 @@ def test_copy_backup(capsys, instance_id, spanner_client):
7477

7578
@pytest.mark.dependency(name="create_backup_with_encryption_key")
7679
def test_create_backup_with_encryption_key(
77-
capsys, instance_id, sample_database, kms_key_name,
80+
capsys,
81+
instance_id,
82+
sample_database,
83+
kms_key_name,
7884
):
7985
backup_sample.create_backup_with_encryption_key(
80-
instance_id, sample_database.database_id, CMEK_BACKUP_ID, kms_key_name,
86+
instance_id,
87+
sample_database.database_id,
88+
CMEK_BACKUP_ID,
89+
kms_key_name,
8190
)
8291
out, _ = capsys.readouterr()
8392
assert CMEK_BACKUP_ID in out
@@ -97,7 +106,10 @@ def test_restore_database(capsys, instance_id, sample_database):
97106
@pytest.mark.dependency(depends=["create_backup_with_encryption_key"])
98107
@RetryErrors(exception=DeadlineExceeded, max_tries=2)
99108
def test_restore_database_with_encryption_key(
100-
capsys, instance_id, sample_database, kms_key_name,
109+
capsys,
110+
instance_id,
111+
sample_database,
112+
kms_key_name,
101113
):
102114
backup_sample.restore_database_with_encryption_key(
103115
instance_id, CMEK_RESTORE_DB_ID, CMEK_BACKUP_ID, kms_key_name
@@ -123,10 +135,14 @@ def test_list_backup_operations(capsys, instance_id, sample_database):
123135

124136
@pytest.mark.dependency(name="list_backup", depends=["create_backup", "copy_backup"])
125137
def test_list_backups(
126-
capsys, instance_id, sample_database,
138+
capsys,
139+
instance_id,
140+
sample_database,
127141
):
128142
backup_sample.list_backups(
129-
instance_id, sample_database.database_id, BACKUP_ID,
143+
instance_id,
144+
sample_database.database_id,
145+
BACKUP_ID,
130146
)
131147
out, _ = capsys.readouterr()
132148
id_count = out.count(BACKUP_ID)
@@ -153,7 +169,9 @@ def test_delete_backup(capsys, instance_id):
153169
@pytest.mark.dependency(depends=["create_backup"])
154170
def test_cancel_backup(capsys, instance_id, sample_database):
155171
backup_sample.cancel_backup(
156-
instance_id, sample_database.database_id, BACKUP_ID,
172+
instance_id,
173+
sample_database.database_id,
174+
BACKUP_ID,
157175
)
158176
out, _ = capsys.readouterr()
159177
cancel_success = "Backup creation was successfully cancelled." in out
@@ -166,7 +184,9 @@ def test_cancel_backup(capsys, instance_id, sample_database):
166184
@RetryErrors(exception=DeadlineExceeded, max_tries=2)
167185
def test_create_database_with_retention_period(capsys, sample_instance):
168186
backup_sample.create_database_with_version_retention_period(
169-
sample_instance.instance_id, RETENTION_DATABASE_ID, RETENTION_PERIOD,
187+
sample_instance.instance_id,
188+
RETENTION_DATABASE_ID,
189+
RETENTION_PERIOD,
170190
)
171191
out, _ = capsys.readouterr()
172192
assert (RETENTION_DATABASE_ID + " created with ") in out

‎samples/samples/batch_sample.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def run_batch_query(instance_id, database_id):
5757
for future in concurrent.futures.as_completed(futures, timeout=3600):
5858
finish, row_ct = future.result()
5959
elapsed = finish - start
60-
print(u"Completed {} rows in {} seconds".format(row_ct, elapsed))
60+
print("Completed {} rows in {} seconds".format(row_ct, elapsed))
6161

6262
# Clean up
6363
snapshot.close()
@@ -68,7 +68,7 @@ def process(snapshot, partition):
6868
print("Started processing partition.")
6969
row_ct = 0
7070
for row in snapshot.process_read_batch(partition):
71-
print(u"SingerId: {}, AlbumId: {}, AlbumTitle: {}".format(*row))
71+
print("SingerId: {}, AlbumId: {}, AlbumTitle: {}".format(*row))
7272
row_ct += 1
7373
return time.time(), row_ct
7474

‎samples/samples/conftest.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
@pytest.fixture(scope="module")
3333
def sample_name():
34-
""" Sample testcase modules must define this fixture.
34+
"""Sample testcase modules must define this fixture.
3535
3636
The name is used to label the instance created by the sample, to
3737
aid in debugging leaked instances.
@@ -98,7 +98,11 @@ def multi_region_instance_config(spanner_client):
9898

9999
@pytest.fixture(scope="module")
100100
def sample_instance(
101-
spanner_client, cleanup_old_instances, instance_id, instance_config, sample_name,
101+
spanner_client,
102+
cleanup_old_instances,
103+
instance_id,
104+
instance_config,
105+
sample_name,
102106
):
103107
sample_instance = spanner_client.instance(
104108
instance_id,
@@ -184,7 +188,8 @@ def database_ddl():
184188
def sample_database(sample_instance, database_id, database_ddl):
185189

186190
sample_database = sample_instance.database(
187-
database_id, ddl_statements=database_ddl,
191+
database_id,
192+
ddl_statements=database_ddl,
188193
)
189194

190195
if not sample_database.exists():

‎samples/samples/noxfile.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ def blacken(session: nox.sessions.Session) -> None:
180180
# format = isort + black
181181
#
182182

183+
183184
@nox.session
184185
def format(session: nox.sessions.Session) -> None:
185186
"""
@@ -229,9 +230,7 @@ def _session_tests(
229230

230231
if os.path.exists("requirements-test.txt"):
231232
if os.path.exists("constraints-test.txt"):
232-
session.install(
233-
"-r", "requirements-test.txt", "-c", "constraints-test.txt"
234-
)
233+
session.install("-r", "requirements-test.txt", "-c", "constraints-test.txt")
235234
else:
236235
session.install("-r", "requirements-test.txt")
237236
with open("requirements-test.txt") as rtfile:
@@ -244,9 +243,9 @@ def _session_tests(
244243
post_install(session)
245244

246245
if "pytest-parallel" in packages:
247-
concurrent_args.extend(['--workers', 'auto', '--tests-per-worker', 'auto'])
246+
concurrent_args.extend(["--workers", "auto", "--tests-per-worker", "auto"])
248247
elif "pytest-xdist" in packages:
249-
concurrent_args.extend(['-n', 'auto'])
248+
concurrent_args.extend(["-n", "auto"])
250249

251250
session.run(
252251
"pytest",
@@ -276,7 +275,7 @@ def py(session: nox.sessions.Session) -> None:
276275

277276

278277
def _get_repo_root() -> Optional[str]:
279-
""" Returns the root folder of the project. """
278+
"""Returns the root folder of the project."""
280279
# Get root of this repository. Assume we don't have directories nested deeper than 10 items.
281280
p = Path(os.getcwd())
282281
for i in range(10):

0 commit comments

Comments
 (0)