Re-enable lint for tests, remove usage of pylint (#4921)

Author: Jon Wayne Parrott

packages/google-cloud-firestore/.flake8

@@ -0,0 +1,12 @@
+[flake8]
+exclude =
+  # Exclude generated code.
+  **/proto/**
+  **/gapic/**
+  *_pb2.py
+
+  # Standard linting exemptions.
+  __pycache__,
+  .git,
+  *.pyc,
+  conf.py

packages/google-cloud-firestore/google/cloud/firestore_v1beta1/transaction.py

@@ -261,7 +261,7 @@ def _pre_commit(self, transaction, *args, **kwargs):
             self.retry_id = self.current_id
         try:
             return self.to_wrap(transaction, *args, **kwargs)
-        except:
+        except:  # noqa
             # NOTE: If ``rollback`` fails this will lose the information
             #       from the original failure.
             transaction._rollback()

packages/google-cloud-firestore/nox.py

@@ -99,22 +99,15 @@ def system(session, py):
 
 @nox.session
 def lint(session):
-    """Run flake8.
+    """Run linters.
 
-    Returns a failure if flake8 finds linting errors or sufficiently
+    Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
     session.interpreter = 'python3.6'
-    session.install('flake8', 'pylint', 'gcp-devrel-py-tools', *LOCAL_DEPS)
+    session.install('flake8')
     session.install('.')
-    session.run('flake8', os.path.join('google', 'cloud', 'firestore'))
-    session.run(
-        'gcp-devrel-py-tools', 'run-pylint',
-        '--config', 'pylint.config.py',
-        '--library-filesets', 'google',
-        '--test-filesets', 'tests',
-        # Temporarily allow this to fail.
-        success_codes=range(0, 100))
+    session.run('flake8', 'google', 'tests')
 
 
 @nox.session

packages/google-cloud-firestore/tests/unit/test__helpers.py

@@ -361,7 +361,8 @@ def test_to_field_paths(self):
         klass = self._get_target_class()
 
         update_values, field_paths = klass.to_field_paths(field_updates)
-        self.assertEqual(update_values, {'a': {'b': field_updates[field_path]}})
+        self.assertEqual(
+            update_values, {'a': {'b': field_updates[field_path]}})
         self.assertEqual(field_paths, [field_path])
 
 
@@ -492,7 +493,8 @@ def test_geo_point(self):
         self.assertEqual(result, expected)
 
     def test_array(self):
-        from google.cloud.firestore_v1beta1.proto.document_pb2 import ArrayValue
+        from google.cloud.firestore_v1beta1.proto.document_pb2 import (
+            ArrayValue)
 
         result = self._call_fut([
             99,
@@ -540,7 +542,8 @@ def _call_fut(values_dict):
     def test_many_types(self):
         from google.protobuf import struct_pb2
         from google.protobuf import timestamp_pb2
-        from google.cloud.firestore_v1beta1.proto.document_pb2 import ArrayValue
+        from google.cloud.firestore_v1beta1.proto.document_pb2 import (
+            ArrayValue)
         from google.cloud.firestore_v1beta1.proto.document_pb2 import MapValue
 
         dt_seconds = 1497397225
@@ -675,7 +678,7 @@ def test_float(self):
         value = _value_pb(double_value=float_val)
         self.assertEqual(self._call_fut(value), float_val)
 
-    @unittest.skipIf((3,) <= sys.version_info < (3,4,4),
+    @unittest.skipIf((3,) <= sys.version_info < (3, 4, 4),
                      'known datetime bug (bpo-23517) in Python')
     def test_datetime(self):
         from google.protobuf import timestamp_pb2
@@ -815,12 +818,13 @@ def _call_fut(value_fields, client=mock.sentinel.client):
 
         return decode_dict(value_fields, client)
 
-    @unittest.skipIf((3,) <= sys.version_info < (3,4,4),
+    @unittest.skipIf((3,) <= sys.version_info < (3, 4, 4),
                      'known datetime bug (bpo-23517) in Python')
     def test_many_types(self):
         from google.protobuf import struct_pb2
         from google.protobuf import timestamp_pb2
-        from google.cloud.firestore_v1beta1.proto.document_pb2 import ArrayValue
+        from google.cloud.firestore_v1beta1.proto.document_pb2 import (
+            ArrayValue)
         from google.cloud.firestore_v1beta1.proto.document_pb2 import MapValue
         from google.cloud._helpers import UTC
 
@@ -1249,7 +1253,6 @@ def test_without_option(self):
         self._helper(current_document=precondition)
 
     def test_with_option(self):
-        from google.cloud.firestore_v1beta1.proto import common_pb2
         from google.cloud.firestore_v1beta1.client import CreateIfMissingOption
 
         option = CreateIfMissingOption(True)
@@ -1342,7 +1345,6 @@ def test_after_writes_not_allowed(self):
             self._call_fut(transaction)
 
     def test_after_writes_allowed(self):
-        from google.cloud.firestore_v1beta1._helpers import ReadAfterWriteError
         from google.cloud.firestore_v1beta1.transaction import Transaction
 
         transaction = Transaction(mock.sentinel.client)

packages/google-cloud-firestore/tests/unit/test_batch.py

@@ -14,9 +14,6 @@
 
 import unittest
 
-from google.gax.errors import GaxError
-from grpc import StatusCode
-from grpc._channel import _RPCState
 import mock
 
 

packages/google-cloud-firestore/tests/unit/test_client.py

@@ -111,7 +111,8 @@ def test___call_options_property(self):
         self.assertIs(client._call_options, mock.sentinel.cached)
 
     def test_collection_factory(self):
-        from google.cloud.firestore_v1beta1.collection import CollectionReference
+        from google.cloud.firestore_v1beta1.collection import (
+            CollectionReference)
 
         collection_id = 'users'
         client = self._make_default_one()
@@ -122,7 +123,8 @@ def test_collection_factory(self):
         self.assertIsInstance(collection, CollectionReference)
 
     def test_collection_factory_nested(self):
-        from google.cloud.firestore_v1beta1.collection import CollectionReference
+        from google.cloud.firestore_v1beta1.collection import (
+            CollectionReference)
 
         client = self._make_default_one()
         parts = ('users', 'alovelace', 'beep')

packages/google-cloud-firestore/tests/unit/test_collection.py

@@ -24,7 +24,8 @@ class TestCollectionReference(unittest.TestCase):
 
     @staticmethod
     def _get_target_class():
-        from google.cloud.firestore_v1beta1.collection import CollectionReference
+        from google.cloud.firestore_v1beta1.collection import (
+            CollectionReference)
 
         return CollectionReference
 

packages/google-cloud-firestore/tests/unit/test_cross_language.py

@@ -12,16 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import functools
 import glob
 import json
 import os
 import unittest
 
 import mock
-from google.cloud.firestore_v1beta1.proto import common_pb2
 from google.cloud.firestore_v1beta1.proto import test_pb2
 from google.protobuf import text_format
 
+
 class TestCrossLanguage(unittest.TestCase):
 
     def test_cross_language(self):
@@ -34,9 +35,9 @@ def test_cross_language(self):
                 test_proto.description,
                 os.path.splitext(os.path.basename(test_filename))[0])
             if test_proto.WhichOneof("test") == "get":
-                pass # The Get tests assume a call to GetDocument, but Python
-                     # calls BatchGetDocuments.
-                     # TODO: make this work.
+                pass  # The Get tests assume a call to GetDocument, but Python
+                # calls BatchGetDocuments.
+                # TODO: make this work.
             else:
                 self.run_write_test(test_proto, desc)
 
@@ -57,7 +58,7 @@ def run_write_test(self, test_proto, desc):
             tp = test_proto.create
             client, doc = self.setup(firestore_api, tp)
             data = convert_data(json.loads(tp.json_data))
-            call = lambda: doc.create(data)
+            call = functools.partial(doc.create, data)
         elif kind == "set":
             tp = test_proto.set
             client, doc = self.setup(firestore_api, tp)
@@ -71,7 +72,7 @@ def run_write_test(self, test_proto, desc):
                 option = convert_precondition(tp.precondition)
             else:
                 option = None
-            call = lambda: doc.update(data, option)
+            call = functools.partial(doc.update, data, option)
         elif kind == "update_paths":
             # Python client doesn't have a way to call update with
             # a list of field paths.
@@ -84,7 +85,7 @@ def run_write_test(self, test_proto, desc):
                 option = convert_precondition(tp.precondition)
             else:
                 option = None
-            call = lambda: doc.delete(option)
+            call = functools.partial(doc.delete, option)
 
         if call is None:
             # TODO: remove this when we handle all kinds.
@@ -101,7 +102,6 @@ def run_write_test(self, test_proto, desc):
                 transaction=None,
                 options=client._call_options)
 
-
     def setup(self, firestore_api, proto):
         from google.cloud.firestore_v1beta1 import Client
         from google.cloud.firestore_v1beta1.client import DEFAULT_DATABASE
@@ -129,7 +129,7 @@ def convert_data(v):
     elif isinstance(v, list):
         return [convert_data(e) for e in v]
     elif isinstance(v, dict):
-        return {k : convert_data(v2) for k, v2 in v.items()}
+        return {k: convert_data(v2) for k, v2 in v.items()}
     else:
         return v
 

packages/google-cloud-firestore/tests/unit/test_document.py

@@ -164,7 +164,8 @@ def test_id_property(self):
         self.assertEqual(document.id, document_id)
 
     def test_parent_property(self):
-        from google.cloud.firestore_v1beta1.collection import CollectionReference
+        from google.cloud.firestore_v1beta1.collection import (
+            CollectionReference)
 
         collection_id = 'grocery-store'
         document_id = 'market'
@@ -177,7 +178,8 @@ def test_parent_property(self):
         self.assertEqual(parent._path, (collection_id,))
 
     def test_collection_factory(self):
-        from google.cloud.firestore_v1beta1.collection import CollectionReference
+        from google.cloud.firestore_v1beta1.collection import (
+            CollectionReference)
 
         collection_id = 'grocery-store'
         document_id = 'market'

packages/google-cloud-firestore/tests/unit/test_query.py

@@ -143,7 +143,6 @@ def test_where(self):
         self._compare_queries(query, new_query, '_field_filters')
 
     def _where_unary_helper(self, value, op_enum, op_string='=='):
-        from google.cloud.firestore_v1beta1.gapic import enums
         from google.cloud.firestore_v1beta1.proto import query_pb2
 
         query = self._make_one_all_fields(skip_fields=('field_filters',))
@@ -653,6 +652,8 @@ def test__to_protobuf_limit_only(self):
         }
         expected_pb = query_pb2.StructuredQuery(**query_kwargs)
 
+        self.assertEqual(structured_query_pb, expected_pb)
+
     def test_get_simple(self):
         # Create a minimal fake GAPIC.
         firestore_api = mock.Mock(spec=['run_query'])
@@ -1044,7 +1045,8 @@ class Test__query_response_to_snapshot(unittest.TestCase):
 
     @staticmethod
     def _call_fut(response_pb, collection, expected_prefix):
-        from google.cloud.firestore_v1beta1.query import _query_response_to_snapshot
+        from google.cloud.firestore_v1beta1.query import (
+            _query_response_to_snapshot)
 
         return _query_response_to_snapshot(
             response_pb, collection, expected_prefix)