Skip to content

Commit c42459a

Browse files
committed
udpates linting
1 parent 14e0e80 commit c42459a

5 files changed

Lines changed: 27 additions & 20 deletions

File tree

packages/sqlalchemy-spanner/create_test_config.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,16 @@
1818
import sys
1919

2020

21-
def set_test_config(project, instance, database, user=None, password=None, host=None, port=None):
21+
def set_test_config(
22+
project, instance, database, user=None, password=None, host=None, port=None
23+
):
2224
config = configparser.ConfigParser()
23-
if user is not None and password is not None and host is not None and port is not None:
25+
if (
26+
user is not None
27+
and password is not None
28+
and host is not None
29+
and port is not None
30+
):
2431
url = (
2532
f"spanner+spanner://{user}:{password}@{host}:{port}"
2633
f"/projects/{project}/instances/{instance}/"

packages/sqlalchemy-spanner/create_test_database.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
import os
1818
import time
1919

20-
from create_test_config import set_test_config
2120
from google.api_core import datetime_helpers
2221
from google.api_core.exceptions import AlreadyExists, ResourceExhausted
2322
from google.cloud.spanner_v1 import Client
24-
from google.cloud.spanner_v1.instance import Instance
2523
from google.cloud.spanner_v1.database import Database
24+
from google.cloud.spanner_v1.instance import Instance
2625

26+
from create_test_config import set_test_config
2727

2828
USE_EMULATOR = os.getenv("SPANNER_EMULATOR_HOST") is not None
2929

packages/sqlalchemy-spanner/drop_test_database.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import re
2020
import time
2121

22-
from create_test_config import set_test_config
2322
from google.api_core import datetime_helpers
2423
from google.api_core.exceptions import AlreadyExists, ResourceExhausted
2524
from google.cloud.spanner_v1 import Client
26-
from google.cloud.spanner_v1.instance import Instance
2725
from google.cloud.spanner_v1.database import Database
26+
from google.cloud.spanner_v1.instance import Instance
2827

28+
from create_test_config import set_test_config
2929

3030
USE_EMULATOR = os.getenv("SPANNER_EMULATOR_HOST") is not None
3131

@@ -55,9 +55,9 @@ def delete_test_database():
5555
instance_id = re.findall(r"instances(.*?)databases", db_url)
5656
database_id = re.findall(r"databases(.*?)$", db_url)
5757

58-
instance = CLIENT.instance(
59-
instance_id="".join(instance_id).replace("/", ""))
58+
instance = CLIENT.instance(instance_id="".join(instance_id).replace("/", ""))
6059
database = instance.database("".join(database_id).replace("/", ""))
6160
database.drop()
6261

62+
6363
delete_test_database()

packages/sqlalchemy-spanner/migration_test_cleanup.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,20 @@
2121

2222

2323
def main(argv):
24-
db_url = argv[0]
24+
db_url = argv[0]
2525

26-
project = re.findall(r"projects(.*?)instances", db_url)
27-
instance_id = re.findall(r"instances(.*?)databases", db_url)
28-
database_id = re.findall(r"databases(.*?)$", db_url)
26+
project = re.findall(r"projects(.*?)instances", db_url)
27+
instance_id = re.findall(r"instances(.*?)databases", db_url)
28+
database_id = re.findall(r"databases(.*?)$", db_url)
2929

30-
client = spanner.Client(project="".join(project).replace("/", ""))
31-
instance = client.instance(instance_id="".join(instance_id).replace("/", ""))
32-
database = instance.database("".join(database_id).replace("/", ""))
30+
client = spanner.Client(project="".join(project).replace("/", ""))
31+
instance = client.instance(instance_id="".join(instance_id).replace("/", ""))
32+
database = instance.database("".join(database_id).replace("/", ""))
3333

34-
database.update_ddl(["DROP TABLE IF EXISTS account", "DROP TABLE IF EXISTS alembic_version"]).result(120)
34+
database.update_ddl(
35+
["DROP TABLE IF EXISTS account", "DROP TABLE IF EXISTS alembic_version"]
36+
).result(120)
3537

3638

3739
if __name__ == "__main__":
38-
main(sys.argv[1:])
40+
main(sys.argv[1:])

packages/sqlalchemy-spanner/test_migration_env.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414

1515
from logging.config import fileConfig
1616

17-
from sqlalchemy import engine_from_config
18-
from sqlalchemy import pool
19-
2017
from alembic import context
2118
from alembic.ddl.impl import DefaultImpl
19+
from sqlalchemy import engine_from_config, pool
2220

2321
# this is the Alembic Config object, which provides
2422
# access to the values within the .ini file in use.

0 commit comments

Comments
 (0)