Skip to content

Commit 9374a9f

Browse files
mf2199c24t
mf2199
authored and
c24t
committed
feat: Stage 3-4 of nox implementation - adding auto-format targets (#478)
1 parent 90b019f commit 9374a9f

20 files changed

Lines changed: 168 additions & 123 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
8181
# expression or the result of a bilateral transformation). In those cases,
8282
# special characters for REGEXP_CONTAINS operators (e.g. \, *, _) must be
8383
# escaped on database side.
84-
pattern_esc = (
85-
r'REPLACE(REPLACE(REPLACE({}, "\\", "\\\\"), "%%", r"\%%"), "_", r"\_")'
86-
)
84+
pattern_esc = r'REPLACE(REPLACE(REPLACE({}, "\\", "\\\\"), "%%", r"\%%"), "_", r"\_")'
8785
# These are all no-ops in favor of using REGEXP_CONTAINS in the customized
8886
# lookups.
8987
pattern_ops = {

‎packages/django-google-spanner/django_spanner/compiler.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,9 @@
77
from django.core.exceptions import EmptyResultSet
88
from django.db.models.sql.compiler import (
99
SQLAggregateCompiler as BaseSQLAggregateCompiler,
10-
)
11-
from django.db.models.sql.compiler import SQLCompiler as BaseSQLCompiler
12-
from django.db.models.sql.compiler import (
10+
SQLCompiler as BaseSQLCompiler,
1311
SQLDeleteCompiler as BaseSQLDeleteCompiler,
14-
)
15-
from django.db.models.sql.compiler import (
1612
SQLInsertCompiler as BaseSQLInsertCompiler,
17-
)
18-
from django.db.models.sql.compiler import (
1913
SQLUpdateCompiler as BaseSQLUpdateCompiler,
2014
)
2115
from django.db.utils import DatabaseError

‎packages/django-google-spanner/django_spanner/introspection.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def get_relations(self, cursor, table_name):
9595
rc.UNIQUE_CONSTRAINT_NAME = ccu.CONSTRAINT_NAME
9696
WHERE
9797
tc.TABLE_NAME="%s"'''
98-
% self.connection.ops.quote_name(table_name),
98+
% self.connection.ops.quote_name(table_name)
9999
)
100100
return {
101101
column: (referred_column, referred_table)
@@ -116,7 +116,7 @@ def get_primary_key_column(self, cursor, table_name):
116116
WHERE
117117
tc.TABLE_NAME="%s" AND tc.CONSTRAINT_TYPE='PRIMARY KEY' AND tc.TABLE_SCHEMA=''
118118
"""
119-
% self.connection.ops.quote_name(table_name),
119+
% self.connection.ops.quote_name(table_name)
120120
)
121121
return results[0][0] if results else None
122122

@@ -133,7 +133,7 @@ def get_constraints(self, cursor, table_name):
133133
INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE
134134
WHERE TABLE_NAME="{table}"'''.format(
135135
table=quoted_table_name
136-
),
136+
)
137137
)
138138
for constraint, column_name in constraint_columns:
139139
if constraint not in constraints:
@@ -160,7 +160,7 @@ def get_constraints(self, cursor, table_name):
160160
WHERE
161161
TABLE_NAME="{table}"'''.format(
162162
table=quoted_table_name
163-
),
163+
)
164164
)
165165
for constraint, constraint_type in constraint_types:
166166
already_added = constraint in constraints
@@ -208,7 +208,7 @@ def get_constraints(self, cursor, table_name):
208208
idx_col.ORDINAL_POSITION
209209
""".format(
210210
table=quoted_table_name
211-
),
211+
)
212212
)
213213
for (
214214
index_name,

‎packages/django-google-spanner/django_spanner/operations.py‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@
1616
from django.db.utils import DatabaseError
1717
from django.utils import timezone
1818
from django.utils.duration import duration_microseconds
19-
2019
from spanner_dbapi.parse_utils import DateStr, TimestampStr, escape_name
2120

2221

2322
class DatabaseOperations(BaseDatabaseOperations):
24-
cast_data_types = {
25-
"CharField": "STRING",
26-
"TextField": "STRING",
27-
}
23+
cast_data_types = {"CharField": "STRING", "TextField": "STRING"}
2824
cast_char_field_without_max_length = "STRING"
2925
compiler_module = "django_spanner.compiler"
3026
# Django's lookup names that require a different name in Spanner's
@@ -247,8 +243,7 @@ def datetime_cast_time_sql(self, field_name, tzname):
247243
# TIMESTAMP to another time zone.
248244
return (
249245
"TIMESTAMP(FORMAT_TIMESTAMP("
250-
"'%%Y-%%m-%%d %%R:%%E9S %%Z', %s, '%s'))"
251-
% (field_name, tzname,)
246+
"'%%Y-%%m-%%d %%R:%%E9S %%Z', %s, '%s'))" % (field_name, tzname)
252247
)
253248

254249
def date_interval_sql(self, timedelta):

‎packages/django-google-spanner/django_spanner/schema.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def create_model(self, model):
7575
)
7676
# Add the SQL to our big list
7777
column_sqls.append(
78-
"%s %s" % (self.quote_name(field.column), definition,)
78+
"%s %s" % (self.quote_name(field.column), definition)
7979
)
8080
# Create a unique constraint separately because Spanner doesn't
8181
# allow them inline on a column.
@@ -279,7 +279,7 @@ def _alter_field(
279279
nullability_changed = old_field.null != new_field.null
280280
if nullability_changed:
281281
index_names = self._constraint_names(
282-
model, [old_field.column], index=True,
282+
model, [old_field.column], index=True
283283
)
284284
if index_names and not old_field.db_index:
285285
raise NotSupportedError(

‎packages/django-google-spanner/django_spanner/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ def check_django_compatability():
1515
raise ImproperlyConfigured(
1616
"You must use the latest version of django-spanner {A}.{B}.x "
1717
"with Django {A}.{B}.y (found django-spanner {C}).".format(
18-
A=django.VERSION[0], B=django.VERSION[1], C=__version__,
18+
A=django.VERSION[0], B=django.VERSION[1], C=__version__
1919
)
2020
)

‎packages/django-google-spanner/docs/conf.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,10 @@
350350
intersphinx_mapping = {
351351
"python": ("http://python.readthedocs.org/en/latest/", None),
352352
"google-auth": ("https://google-auth.readthedocs.io/en/stable", None),
353-
"google.api_core": ("https://googleapis.dev/python/google-api-core/latest/", None),
353+
"google.api_core": (
354+
"https://googleapis.dev/python/google-api-core/latest/",
355+
None,
356+
),
354357
"grpc": ("https://grpc.io/grpc/python/", None),
355358
}
356359

‎packages/django-google-spanner/noxfile.py‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,52 @@
1414
import shutil
1515

1616

17+
BLACK_VERSION = "black==19.10b0"
18+
BLACK_PATHS = [
19+
"django_spanner",
20+
"docs",
21+
"spanner_dbapi",
22+
"tests",
23+
"noxfile.py",
24+
"setup.py",
25+
]
26+
27+
28+
@nox.session(python="3.8")
29+
def lint(session):
30+
"""Run linters.
31+
32+
Returns a failure if the linters find linting errors or sufficiently
33+
serious code quality issues.
34+
"""
35+
session.install("flake8", BLACK_VERSION)
36+
session.run("black", "--check", *BLACK_PATHS)
37+
session.run("flake8", "django_spanner", "spanner_dbapi", "tests")
38+
39+
40+
@nox.session(python="3.8")
41+
def blacken(session):
42+
"""Run black.
43+
44+
Format code to uniform standard.
45+
46+
This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
47+
That run uses an image that doesn't have 3.6 installed. Before updating this
48+
check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
49+
"""
50+
session.install(BLACK_VERSION)
51+
session.run("black", *BLACK_PATHS)
52+
53+
54+
@nox.session(python="3.8")
55+
def lint_setup_py(session):
56+
"""Verify that setup.py is valid (including RST check)."""
57+
session.install("docutils", "pygments")
58+
session.run(
59+
"python", "setup.py", "check", "--restructuredtext", "--strict"
60+
)
61+
62+
1763
def default(session):
1864
# Install all test dependencies, then install this package in-place.
1965
session.install("mock", "pytest", "pytest-cov")
@@ -24,7 +70,7 @@ def default(session):
2470
"py.test",
2571
"--quiet",
2672
os.path.join("tests", "spanner_dbapi"),
27-
*session.posargs,
73+
*session.posargs
2874
)
2975

3076

‎packages/django-google-spanner/setup.cfg‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ ignore =
55
W503 # allow line breaks before binary ops
66
W504 # allow line breaks after binary ops
77
E203 # allow whitespace before ':' (https://github.com/psf/black#slices)
8+
exclude =
9+
# Exclude generated code.
10+
**/_build/**
11+
12+
# Standard linting exemptions.
13+
__pycache__,
14+
.git,
15+
*.pyc,
16+
conf.py
817

918
[isort]
1019
use_parentheses = True

‎packages/django-google-spanner/setup.py‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919
# 'Development Status :: 4 - Beta'
2020
# 'Development Status :: 5 - Production/Stable'
2121
release_status = "Development Status :: 3 - Alpha"
22-
dependencies = [
23-
'sqlparse >= 0.3.0',
24-
'google-cloud-spanner >= 1.8.0',
25-
]
22+
dependencies = ["sqlparse >= 0.3.0", "google-cloud-spanner >= 1.8.0"]
2623
extras = {}
2724

2825

@@ -36,30 +33,30 @@
3633

3734

3835
setup(
39-
name=name,
40-
version=version,
41-
description=description,
42-
long_description=readme,
43-
author='Google LLC',
44-
author_email='cloud-spanner-developers@googlegroups.com',
45-
license='BSD',
46-
packages=find_packages(exclude=['tests']),
47-
install_requires=dependencies,
48-
url="https://github.com/googleapis/python-spanner-django",
49-
classifiers=[
50-
release_status,
51-
'Environment :: Web Environment',
52-
'Intended Audience :: Developers',
53-
'License :: OSI Approved :: BSD',
54-
'Operating System :: OS Independent',
55-
'Programming Language :: Python :: 3',
56-
'Programming Language :: Python :: 3.5',
57-
'Programming Language :: Python :: 3.6',
58-
'Programming Language :: Python :: 3.7',
59-
'Topic :: Utilities',
60-
'Framework :: Django',
61-
'Framework :: Django :: 2.2',
62-
],
63-
extras_require=extras,
64-
python_requires=">=3.5",
36+
name=name,
37+
version=version,
38+
description=description,
39+
long_description=readme,
40+
author="Google LLC",
41+
author_email="cloud-spanner-developers@googlegroups.com",
42+
license="BSD",
43+
packages=find_packages(exclude=["tests"]),
44+
install_requires=dependencies,
45+
url="https://github.com/googleapis/python-spanner-django",
46+
classifiers=[
47+
release_status,
48+
"Environment :: Web Environment",
49+
"Intended Audience :: Developers",
50+
"License :: OSI Approved :: BSD",
51+
"Operating System :: OS Independent",
52+
"Programming Language :: Python :: 3",
53+
"Programming Language :: Python :: 3.5",
54+
"Programming Language :: Python :: 3.6",
55+
"Programming Language :: Python :: 3.7",
56+
"Topic :: Utilities",
57+
"Framework :: Django",
58+
"Framework :: Django :: 2.2",
59+
],
60+
extras_require=extras,
61+
python_requires=">=3.5",
6562
)

0 commit comments

Comments
 (0)