chore: lint

Author: parthea

packages/proto-plus/.flake8

@@ -6,3 +6,6 @@ ignore =
   # Line over-indented for visual indent.
   # This works poorly with type annotations in method declarations.
   E128, E131
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): 
+  # Resolve flake8 lint issues
+  E203, E231, E266, E501, W503

packages/proto-plus/noxfile.py

@@ -18,9 +18,14 @@
 import pathlib
 
 
+BLACK_VERSION = "black[jupyter]==23.7.0"
+ISORT_VERSION = "isort==5.11.0"
+
+LINT_PATHS = ["docs", "proto", "tests", "noxfile.py", "setup.py"]
+
 CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
 
-DEFAULT_PYTHON_VERSION="3.14"
+DEFAULT_PYTHON_VERSION = "3.14"
 
 PYTHON_VERSIONS = [
     "3.7",
@@ -42,6 +47,16 @@
 def unit(session, implementation):
     """Run the unit test suite."""
 
+    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2388):
+    # Remove this check once support for Protobuf 3.x is dropped.
+    if implementation == "cpp" and session.python in (
+        "3.11",
+        "3.12",
+        "3.13",
+        "3.14",
+    ):
+        session.skip("cpp implementation is not supported in python 3.11+")
+
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
     )
@@ -178,4 +193,21 @@ def mypy(session):
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/15104):
     # Enable mypy once this bug is fixed.
-    session.skip("Skip mypy since this library doesn't have py.typed")
+    session.skip("Skip mypy since this library doesn't have py.typed")
+
+
+@nox.session(python=DEFAULT_PYTHON_VERSION)
+def lint(session):
+    """Run linters.
+
+    Returns a failure if the linters find linting errors or sufficiently
+    serious code quality issues.
+    """
+    session.install("flake8", BLACK_VERSION)
+    session.run(
+        "black",
+        "--check",
+        *LINT_PATHS,
+    )
+
+    session.run("flake8", "proto", "tests")

packages/proto-plus/proto/datetime_helpers.py

@@ -14,7 +14,6 @@
 
 """Helpers for :mod:`datetime`."""
 
-import calendar
 import datetime
 import re
 

packages/proto-plus/proto/marshal/collections/maps.py

@@ -15,7 +15,6 @@
 import collections
 
 from proto.utils import cached_property
-from google.protobuf.message import Message
 
 
 class MapComposite(collections.abc.MutableMapping):

packages/proto-plus/proto/marshal/marshal.py

@@ -13,9 +13,7 @@
 # limitations under the License.
 
 import abc
-import enum
 
-from google.protobuf import message
 from google.protobuf import duration_pb2
 from google.protobuf import timestamp_pb2
 from google.protobuf import field_mask_pb2

packages/proto-plus/proto/marshal/rules/dates.py

@@ -14,11 +14,10 @@
 
 from datetime import datetime
 from datetime import timedelta
-from datetime import timezone
 
 from google.protobuf import duration_pb2
 from google.protobuf import timestamp_pb2
-from proto import datetime_helpers, utils
+from proto import datetime_helpers
 
 
 class TimestampRule:

packages/proto-plus/proto/marshal/rules/message.py

@@ -34,7 +34,7 @@ def to_proto(self, value):
             try:
                 # Try the fast path first.
                 return self._descriptor(**value)
-            except (TypeError, ValueError, AttributeError) as ex:
+            except (TypeError, ValueError, AttributeError):
                 # If we have a TypeError, ValueError or AttributeError,
                 # try the slow path in case the error
                 # was:

packages/proto-plus/proto/utils.py

@@ -17,7 +17,7 @@
 
 def has_upb():
     try:
-        from google._upb import _message  # pylint: disable=unused-import
+        from google._upb import _message  # noqa: F401
 
         has_upb = True
     except ImportError:

packages/proto-plus/tests/test_fields_bytes.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import base64
-import pytest
 
 import proto
 
@@ -79,7 +78,7 @@ class Foo(proto.Message):
     # converting a proto message to a dict base64 encodes the bytes
     # because it may be sent over the network via a protocol like HTTP.
     encoded_swallow: str = base64.urlsafe_b64encode(b"unladen swallow").decode("utf-8")
-    assert type(encoded_swallow) == str
+    assert type(encoded_swallow) is str
     foo.baz = encoded_swallow
     assert foo.baz == b"unladen swallow"
 

packages/proto-plus/tests/test_fields_optional.py

@@ -26,14 +26,14 @@ class Squid(proto.Message):
 
     assert Squid.mass_kg in squid_1
     assert squid_1.mass_kg == 20
-    assert not Squid.mass_kg in squid_2
+    assert Squid.mass_kg not in squid_2
 
     squid_2.mass_kg = 30
     assert squid_2.mass_kg == 30
     assert Squid.mass_kg in squid_2
 
     del squid_1.mass_kg
-    assert not Squid.mass_kg in squid_1
+    assert Squid.mass_kg not in squid_1
 
     with pytest.raises(AttributeError):
         Squid.shell
@@ -53,7 +53,7 @@ class Squid(proto.Message):
     s = Squid(mass_kg=20)
     assert s.mass_kg == 20
     assert not s.mass_lbs
-    assert not Squid.iridiphore_num in s
+    assert Squid.iridiphore_num not in s
 
     s.iridiphore_num = 600
     assert s.mass_kg == 20
@@ -76,7 +76,7 @@ class Clam(proto.Message):
 
     assert c.mass_kg == 20
     assert not c.mass_lbs
-    assert not Clam.flute_radius in c
+    assert Clam.flute_radius not in c
     c.flute_radius = 30
     assert c.mass_kg == 20
     assert not c.mass_lbs