fix lint issues, run and pin isort < 5

aabmass · aabmass · commit 8fed2d7c2485 · 2021-01-14T18:15:00.000Z
diff --git a/python/sqlcommenter-python/google/cloud/sqlcommenter/psycopg2/extension.py b/python/sqlcommenter-python/google/cloud/sqlcommenter/psycopg2/extension.py
@@ -23,9 +23,9 @@
 from google.cloud.sqlcommenter.opencensus import get_opencensus_values
 from google.cloud.sqlcommenter.opentelemetry import get_opentelemetry_values
 
-
 logger = logging.getLogger(__name__)
 
+
 # This integration extends psycopg2.extensions.cursor
 # by implementing a custom execute method.
 #
diff --git a/python/sqlcommenter-python/google/cloud/sqlcommenter/sqlalchemy/executor.py b/python/sqlcommenter-python/google/cloud/sqlcommenter/sqlalchemy/executor.py
@@ -17,6 +17,7 @@
 # This integration implements the before_cursor_execute hook factory as per:
 #   https://kite.com/python/docs/sqlalchemy.events.ConnectionEvents.before_execute
 from __future__ import absolute_import
+
 import logging
 
 import sqlalchemy
@@ -25,9 +26,9 @@
 from google.cloud.sqlcommenter.opencensus import get_opencensus_values
 from google.cloud.sqlcommenter.opentelemetry import get_opentelemetry_values
 
-
 logger = logging.getLogger(__name__)
 
+
 def BeforeExecuteFactory(
         with_framework=True, with_controller=True, with_route=True,
         with_opencensus=False, with_opentelemetry=False, with_db_driver=False,
diff --git a/python/sqlcommenter-python/setup.py b/python/sqlcommenter-python/setup.py
@@ -18,10 +18,12 @@
 
 from setuptools import find_packages, setup
 
+
 def read_file(filename):
     with open(os.path.join(os.path.dirname(__file__), filename)) as file:
         return file.read()
 
+
 setup(
     name='google-cloud-sqlcommenter',
     version='1.0.0',
diff --git a/python/sqlcommenter-python/tests/compat.py b/python/sqlcommenter-python/tests/compat.py
@@ -30,5 +30,5 @@ def skipIfPy2(testcase):
         sys.version_info.major == 2, "Feature only support in python3+"
     )(testcase)
 
-__all__ = ["mock"]
 
+__all__ = ["mock"]
diff --git a/python/sqlcommenter-python/tests/psycopg2/tests.py b/python/sqlcommenter-python/tests/psycopg2/tests.py
@@ -88,7 +88,7 @@ def test_opentelemetry(self):
                 "tracestate='some_key%%3Dsome_value'*/",
                 with_opentelemetry=True,
             )
-    
+
     def test_both_opentelemetry_and_opencensus_warn(self):
         with mock.patch(
             "google.cloud.sqlcommenter.psycopg2.extension.logger"
@@ -101,6 +101,7 @@ def test_both_opentelemetry_and_opencensus_warn(self):
             )
             self.assertEqual(len(logger_mock.warning.mock_calls), 1)
 
+
 class FlaskTests(Psycopg2TestCase):
     flask_info = {
         'framework': 'flask',
diff --git a/python/sqlcommenter-python/tests/sqlalchemy/tests.py b/python/sqlcommenter-python/tests/sqlalchemy/tests.py
@@ -15,7 +15,6 @@
 # limitations under the License.
 
 from unittest import TestCase
-from unittest.case import skip, skipIf
 
 import sqlalchemy
 from google.cloud.sqlcommenter.sqlalchemy.executor import BeforeExecuteFactory
@@ -127,4 +126,3 @@ def test_route_disabled(self, get_info):
             "SELECT 1; /*controller='c',framework='flask'*/",
             with_route=False,
         )
-
diff --git a/python/sqlcommenter-python/tox.ini b/python/sqlcommenter-python/tox.ini
@@ -28,7 +28,7 @@ commands =
 skip_install = True
 deps =
     flake8
-    isort
+    isort < 5
 commands =
     flake8
     isort --recursive --check-only --diff

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@`
`23`	`23`	`from google.cloud.sqlcommenter.opencensus import get_opencensus_values`
`24`	`24`	`from google.cloud.sqlcommenter.opentelemetry import get_opentelemetry_values`
`25`	`25`
`26`		`-`
`27`	`26`	`logger = logging.getLogger(__name__)`
`28`	`27`
	`28`	`+`
`29`	`29`	`# This integration extends psycopg2.extensions.cursor`
`30`	`30`	`# by implementing a custom execute method.`
`31`	`31`	`#`