Skip to content

Commit 8914d61

Browse files
cofincofin
authored
fix: linting updates (#474)
1 parent 5cbdc2d commit 8914d61

File tree

9 files changed

+36
-29
lines changed

9 files changed

+36
-29
lines changed

‎pyproject.toml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,6 @@ lint.ignore = [
357357
"B008", # flake8-bugbear - Do not perform function call `Parameter` in argument defaultsRuff(B008)
358358
"RUF012", # ruff - mutable class attributes should be annotated with `typing.ClassVar`
359359
"ANN401", # ruff - Dynamically typed expressions (typing.Any) are disallowed
360-
"ANN102",
361-
"ANN101", # ruff - Missing type annotation for `self` in method
362360
"PLR0913", # ruff - Too many arguments to function call
363361
"PLR2004", # Magic value used in comparison
364362
"FBT001", # Boolean typed positional argument in function definition
@@ -373,14 +371,10 @@ lint.ignore = [
373371
"RUF006",
374372
"SLF001",
375373
"PT007",
376-
'PT004',
377-
'PT005',
378374
'S603',
379375
"E501", # pycodestyle line too long, handled by black
380376
"PLW2901", # pylint - for loop variable overwritten by assignment target
381377
"ANN401",
382-
"ANN102",
383-
"ANN101",
384378
"FBT",
385379
"PLR0913", # too many arguments
386380
"PT",

‎scripts/collector/sqlserver/instanceReview.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ if ($powerShellVersion -ge 5) {
700700
WriteLog -logLocation $foldername\$logFile -logMessage "to Google to complete assessment" -logOperation "MESSAGE"
701701
} else {
702702
WriteLog -logLocation $foldername\$logFile -logMessage "Return file $outputDirectory\$zippedopfolder" -logOperation "MESSAGE"
703-
WriteLog -logLocation $foldername\$logFile -logMessage "to Google to complete assessment" -logOperation "MESSAGE"
703+
WriteLog -logLocation $foldername\$logFile -logMessage "to Google to complete assessment" -logOperation "MESSAGE"
704704
}
705705
WriteLog -logLocation $foldername\$logFile -logMessage "Collection Complete..." -logOperation "MESSAGE"
706706
}
@@ -712,4 +712,4 @@ else {
712712
WriteLog -logLocation $foldername\$logFile -logMessage "Collection Complete..." -logOperation "MESSAGE"
713713
}
714714

715-
Exit 0
715+
Exit 0

‎src/dma/lib/db/adapters/asyncmy.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@ def process_sql(self, _query_name, _op_type, sql):
3535
"""
3636
return sql
3737

38-
async def select(self, conn, _query_name, sql, parameters, record_class=None):
39-
async with self.select_cursor(conn, _query_name, sql, parameters) as cur:
38+
async def select(self, conn, query_name, sql, parameters, record_class=None):
39+
async with self.select_cursor(conn, query_name, sql, parameters) as cur:
4040
await cur.execute(sql)
4141
results = await cur.fetchall()
4242
if record_class is not None:
4343
column_names = [c[0] for c in cur.description]
4444
results = [record_class(**dict(zip(column_names, row))) for row in results]
4545
return results
4646

47-
async def select_one(self, conn, _query_name, sql, parameters, record_class=None):
48-
async with self.select_cursor(conn, _query_name, sql, parameters) as cur:
47+
async def select_one(self, conn, query_name, sql, parameters, record_class=None):
48+
async with self.select_cursor(conn, query_name, sql, parameters) as cur:
4949
await cur.execute(sql)
5050
result = await cur.fetchone()
5151
if result is not None and record_class is not None:
5252
column_names = [c[0] for c in cur.description]
5353
result = record_class(**dict(zip(column_names, result)))
5454
return result
5555

56-
async def select_value(self, conn, _query_name, sql, parameters):
57-
async with self.select_cursor(conn, _query_name, sql, parameters) as cur:
56+
async def select_value(self, conn, query_name, sql, parameters):
57+
async with self.select_cursor(conn, query_name, sql, parameters) as cur:
5858
await cur.execute(sql)
5959
result = await cur.fetchone()
6060
if isinstance(result, dict):
@@ -66,21 +66,21 @@ async def select_cursor(self, conn, _query_name, sql, parameters):
6666
async with conn.cursor(cursor=asyncmy.cursors.DictCursor) as cur:
6767
yield cur
6868

69-
async def insert_returning(self, conn, _query_name, sql, parameters):
70-
async with self.select_cursor(conn, _query_name, sql, parameters) as cur:
69+
async def insert_returning(self, conn, query_name, sql, parameters):
70+
async with self.select_cursor(conn, query_name, sql, parameters) as cur:
7171
await cur.execute(sql)
7272
return cur.lastrowid
7373

74-
async def insert_update_delete(self, conn, _query_name, sql, parameters):
75-
async with self.select_cursor(conn, _query_name, sql, parameters) as cur:
74+
async def insert_update_delete(self, conn, query_name, sql, parameters):
75+
async with self.select_cursor(conn, query_name, sql, parameters) as cur:
7676
await cur.execute(sql)
7777
return cur.rowcount
7878

79-
async def insert_update_delete_many(self, conn, _query_name, sql, parameters):
80-
async with self.select_cursor(conn, _query_name, sql, parameters) as cur:
79+
async def insert_update_delete_many(self, conn, query_name, sql, parameters):
80+
async with self.select_cursor(conn, query_name, sql, parameters) as cur:
8181
await cur.executemany(sql, parameters)
8282

83-
async def execute_script(self, conn, _query_name, sql, parameters):
84-
async with self.select_cursor(conn, _query_name, sql, parameters) as cur:
83+
async def execute_script(self, conn, query_name, sql, parameters):
84+
async with self.select_cursor(conn, query_name, sql, parameters) as cur:
8585
await cur.execute(sql)
8686
return "DONE"

‎src/dma/utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ async def maybe_async(obj: T) -> T: ...
5959

6060

6161
async def maybe_async(obj: Awaitable[T] | T) -> T:
62-
return cast(T, await obj) if inspect.isawaitable(obj) else cast(T, obj)
62+
return cast("T", await obj) if inspect.isawaitable(obj) else cast("T", obj)
6363

6464

6565
def maybe_async_cm(obj: AbstractContextManager[T] | AbstractAsyncContextManager[T]) -> AbstractAsyncContextManager[T]:
6666
if isinstance(obj, AbstractContextManager):
67-
return cast(AbstractAsyncContextManager[T], _ContextManagerWrapper(obj))
67+
return cast("AbstractAsyncContextManager[T]", _ContextManagerWrapper(obj))
6868
return obj
6969

7070

‎tests/helpers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ async def maybe_async(obj: T) -> T: ...
5454

5555

5656
async def maybe_async(obj: Awaitable[T] | T) -> T:
57-
return cast(T, await obj) if inspect.isawaitable(obj) else cast(T, obj)
57+
return cast("T", await obj) if inspect.isawaitable(obj) else cast("T", obj)
5858

5959

6060
def maybe_async_cm(obj: AbstractContextManager[T] | AbstractAsyncContextManager[T]) -> AbstractAsyncContextManager[T]:
6161
if isinstance(obj, AbstractContextManager):
62-
return cast(AbstractAsyncContextManager[T], _ContextManagerWrapper(obj))
62+
return cast("AbstractAsyncContextManager[T]", _ContextManagerWrapper(obj))
6363
return obj
6464

6565

‎tests/integration/mysql/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ async def mysql56_asyncmy_engine(
118118
],
119119
)
120120
def async_engine(request: FixtureRequest) -> AsyncEngine:
121-
return cast(AsyncEngine, request.getfixturevalue(request.param))
121+
return cast("AsyncEngine", request.getfixturevalue(request.param))

‎tests/integration/oracle/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ async def oracle23ai_async_engine(
105105
],
106106
)
107107
def async_engine(request: FixtureRequest) -> AsyncEngine:
108-
return cast(AsyncEngine, request.getfixturevalue(request.param))
108+
return cast("AsyncEngine", request.getfixturevalue(request.param))

‎tests/integration/postgres/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,4 @@ async def postgres12_async_engine(
190190
],
191191
)
192192
def async_engine(request: FixtureRequest) -> AsyncEngine:
193-
return cast(AsyncEngine, request.getfixturevalue(request.param))
193+
return cast("AsyncEngine", request.getfixturevalue(request.param))

‎tests/unit/test_collector/test_workflows/__init__.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Copyright 2024 Google LLC
2+
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
7+
# https://www.apache.org/licenses/LICENSE-2.0
8+
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.

0 commit comments

Comments
 (0)