Skip to content

Commit e272dd0

Browse files
author
Jon Wayne Parrott
authored
Re-enable lint for tests, remove usage of pylint (googleapis#4921)
1 parent 1e0d673 commit e272dd0

File tree

90 files changed

+342
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+342
-397
lines changed

‎bigquery/.flake8‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
[flake8]
22
exclude =
3+
# Exclude generated code.
4+
**/proto/**
5+
**/gapic/**
6+
*_pb2.py
7+
8+
# Standard linting exemptions.
39
__pycache__,
410
.git,
511
*.pyc,

‎bigquery/nox.py‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,12 @@ def lint(session):
145145
"""
146146
session.interpreter = 'python3.6'
147147

148-
session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
148+
session.install('flake8')
149149
session.install('.')
150150
session.run('flake8', os.path.join('google', 'cloud', 'bigquery'))
151151
session.run('flake8', 'tests')
152152
session.run(
153153
'flake8', os.path.join(os.pardir, 'docs', 'bigquery', 'snippets.py'))
154-
session.run(
155-
'gcp-devrel-py-tools', 'run-pylint',
156-
'--config', 'pylint.config.py',
157-
'--library-filesets', 'google',
158-
'--test-filesets', 'tests',
159-
# Temporarily allow this to fail.
160-
success_codes=range(0, 100))
161154

162155

163156
@nox.session

‎bigquery_datatransfer/nox.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def default(session):
4242
'py.test',
4343
'--quiet',
4444
'--cov=google.cloud.bigquery_datatransfer',
45-
'--cov=google.cloud.bigquery_datatransfer_v1',
45+
'--cov=google.cloud.bigquery_datatransfer_v1',
4646
'--cov=tests.unit',
4747
'--cov-append',
4848
'--cov-config=.coveragerc',

‎bigtable/.flake8‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[flake8]
22
exclude =
3-
# BigTable includes generated code in the manual layer;
4-
# do not lint this.
5-
google/cloud/bigtable/_generated/*.py,
3+
# Exclude generated code.
4+
**/proto/**
5+
**/gapic/**
6+
*_pb2.py
67

78
# Standard linting exemptions.
89
__pycache__,

‎bigtable/nox.py‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,9 @@ def lint(session):
9999
serious code quality issues.
100100
"""
101101
session.interpreter = 'python3.6'
102-
session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
102+
session.install('flake8')
103103
session.install('.')
104-
session.run('flake8', 'google/cloud/bigtable')
105-
session.run(
106-
'gcp-devrel-py-tools', 'run-pylint',
107-
'--config', 'pylint.config.py',
108-
'--library-filesets', 'google',
109-
'--test-filesets', 'tests',
110-
# Temporarily allow this to fail.
111-
success_codes=range(0, 100))
104+
session.run('flake8', 'google', 'tests')
112105

113106

114107
@nox.session

‎bigtable/tests/unit/test_row_data.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515

1616
import unittest
17-
import timeit
18-
import csv
1917

2018

2119
class TestCell(unittest.TestCase):
@@ -47,7 +45,8 @@ def _from_pb_test_helper(self, labels=None):
4745
else:
4846
cell_pb = data_v2_pb2.Cell(
4947
value=value, timestamp_micros=timestamp_micros, labels=labels)
50-
cell_expected = self._make_one(value, timestamp_micros, labels=labels)
48+
cell_expected = self._make_one(
49+
value, timestamp_micros, labels=labels)
5150

5251
klass = self._get_target_class()
5352
result = klass.from_pb(cell_pb)
@@ -631,6 +630,7 @@ def test_empty_cell_chunk(self):
631630
def test_empty_second_qualifier(self):
632631
self._match_results('empty second qualifier')
633632

633+
634634
def _flatten_cells(prd):
635635
# Match results format from JSON testcases.
636636
# Doesn't handle error cases.

‎bigtable/tests/unit/test_table.py‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,6 @@ def test_callable_empty_rows(self):
642642
self.assertEqual(len(statuses), 0)
643643

644644
def test_callable_no_retry_strategy(self):
645-
from google.api_core.retry import Retry
646645
from google.cloud.bigtable.row import DirectRow
647646

648647
# Setup:
@@ -685,7 +684,6 @@ def test_callable_no_retry_strategy(self):
685684
self.assertEqual(result, expected_result)
686685

687686
def test_callable_retry(self):
688-
from google.api_core.retry import Retry
689687
from google.cloud.bigtable.row import DirectRow
690688
from google.cloud.bigtable.table import DEFAULT_RETRY
691689

@@ -735,7 +733,6 @@ def test_callable_retry(self):
735733
self.assertEqual(result, expected_result)
736734

737735
def test_callable_retry_timeout(self):
738-
from google.api_core.retry import Retry
739736
from google.cloud.bigtable.row import DirectRow
740737
from google.cloud.bigtable.table import DEFAULT_RETRY
741738

@@ -811,8 +808,8 @@ def test_do_mutate_retryable_rows(self):
811808
# Patch the stub used by the API method.
812809
client._data_stub = _FakeStub([response])
813810

814-
worker = self._make_worker(table._instance._client,
815-
table.name, [row_1, row_2])
811+
worker = self._make_worker(
812+
table._instance._client, table.name, [row_1, row_2])
816813
statuses = worker._do_mutate_retryable_rows()
817814

818815
result = [status.code for status in statuses]
@@ -853,8 +850,8 @@ def test_do_mutate_retryable_rows_retry(self):
853850
# Patch the stub used by the API method.
854851
client._data_stub = _FakeStub([response])
855852

856-
worker = self._make_worker(table._instance._client,
857-
table.name, [row_1, row_2, row_3])
853+
worker = self._make_worker(
854+
table._instance._client, table.name, [row_1, row_2, row_3])
858855

859856
with self.assertRaises(_BigtableRetryableError):
860857
worker._do_mutate_retryable_rows()
@@ -902,8 +899,9 @@ def test_do_mutate_retryable_rows_second_retry(self):
902899
# Patch the stub used by the API method.
903900
client._data_stub = _FakeStub([response])
904901

905-
worker = self._make_worker(table._instance._client,
906-
table.name, [row_1, row_2, row_3, row_4])
902+
worker = self._make_worker(
903+
table._instance._client,
904+
table.name, [row_1, row_2, row_3, row_4])
907905
worker.responses_statuses = self._make_responses_statuses([
908906
self.SUCCESS,
909907
self.RETRYABLE_1,
@@ -954,8 +952,9 @@ def test_do_mutate_retryable_rows_second_try(self):
954952
# Patch the stub used by the API method.
955953
client._data_stub = _FakeStub([response])
956954

957-
worker = self._make_worker(table._instance._client,
958-
table.name, [row_1, row_2, row_3, row_4])
955+
worker = self._make_worker(
956+
table._instance._client,
957+
table.name, [row_1, row_2, row_3, row_4])
959958
worker.responses_statuses = self._make_responses_statuses([
960959
self.SUCCESS,
961960
self.RETRYABLE_1,
@@ -974,7 +973,6 @@ def test_do_mutate_retryable_rows_second_try(self):
974973

975974
def test_do_mutate_retryable_rows_second_try_no_retryable(self):
976975
from google.cloud.bigtable.row import DirectRow
977-
from tests.unit._testing import _FakeStub
978976

979977
# Setup:
980978
# - Mutate 2 rows.
@@ -993,10 +991,10 @@ def test_do_mutate_retryable_rows_second_try_no_retryable(self):
993991
row_2 = DirectRow(row_key=b'row_key_2', table=table)
994992
row_2.set_cell('cf', b'col', b'value2')
995993

996-
worker = self._make_worker(table._instance._client,
997-
table.name, [row_1, row_2])
994+
worker = self._make_worker(
995+
table._instance._client, table.name, [row_1, row_2])
998996
worker.responses_statuses = self._make_responses_statuses(
999-
[self.SUCCESS, self.NON_RETRYABLE])
997+
[self.SUCCESS, self.NON_RETRYABLE])
1000998

1001999
statuses = worker._do_mutate_retryable_rows()
10021000

@@ -1023,8 +1021,9 @@ def test_do_mutate_retryable_rows_mismatch_num_responses(self):
10231021
# Patch the stub used by the API method.
10241022
client._data_stub = _FakeStub([response])
10251023

1026-
worker = self._make_worker(table._instance._client,
1027-
table.name, [row_1, row_2])
1024+
worker = self._make_worker(
1025+
table._instance._client,
1026+
table.name, [row_1, row_2])
10281027
with self.assertRaises(RuntimeError):
10291028
worker._do_mutate_retryable_rows()
10301029

‎container/nox.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def default(session):
4242
'py.test',
4343
'--quiet',
4444
'--cov=google.cloud.container',
45-
'--cov=google.cloud.container_v1',
45+
'--cov=google.cloud.container_v1',
4646
'--cov=tests.unit',
4747
'--cov-append',
4848
'--cov-config=.coveragerc',

‎core/nox.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ def lint(session):
7979
serious code quality issues.
8080
"""
8181
session.interpreter = 'python3.6'
82-
session.install(
83-
'flake8', 'flake8-import-order', *LOCAL_DEPS)
82+
session.install('flake8', 'flake8-import-order')
8483
session.install('.')
8584
session.run('flake8', 'google', 'tests')
8685

‎dataproc/nox.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def default(session):
4242
'py.test',
4343
'--quiet',
4444
'--cov=google.cloud.dataproc',
45-
'--cov=google.cloud.dataproc_v1',
45+
'--cov=google.cloud.dataproc_v1',
4646
'--cov=tests.unit',
4747
'--cov-append',
4848
'--cov-config=.coveragerc',

0 commit comments

Comments
 (0)