SNOW-132325 SNOW-126369 SNOW-121544 adding pre-commit hooks to SQLAlchemy

Author: sfc-gh-stakeda

.gitignore

@@ -1,5 +1,6 @@
 .svn
 # Byte-compiled / optimized / DLL files
+.tox
 __pycache__/
 *.py[cod]
 *$py.class

.pre-commit-config.yaml

@@ -0,0 +1,27 @@
+exclude: '^(.*egg.info.*|.*/parameters.py).*$'
+repos:
+-   repo: https://github.com/asottile/seed-isort-config
+    rev: v1.9.1
+    hooks:
+    -   id: seed-isort-config
+        # This work around is necessary until we break the monorepo apart
+        entry: bash -c "cd Python/snowflake/sqlalchemy && seed-isort-config"
+-   repo: https://github.com/pre-commit/mirrors-isort
+    rev: v4.3.21
+    hooks:
+    -   id: isort
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.2.3
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: debug-statements
+    -   id: flake8
+        entry: bash -c "cd Python/snowflake/sqlalchemy && flake8"
+        additional_dependencies: ["flake8-bugbear == 19.3.0"]
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v1.19.0
+    hooks:
+    -   id: pyupgrade
+        entry: bash -c "cd Python/snowflake/sqlalchemy && pyupgrade"

README.rst

@@ -252,7 +252,7 @@ SQLAlchemy provides `the runtime inspection API <http://docs.sqlalchemy.org/en/l
         schema = inspector.default_schema_name
         for table_name in inspector.get_table_names(schema):
             column_metadata = inspector.get_columns(table_name, schema)
-            primary_keys = inspector.get_primary_keys(table_name, schema)
+            primary_keys = inspector.get_pk_constraint(table_name, schema)
             foreign_keys = inspector.get_foreign_keys(table_name, schema)
             ...
 

setup.cfg

@@ -3,6 +3,6 @@ universal = 1
 
 [flake8]
 ignore=F821,W504,E501,E402,E122,E127,E126,E128,E131,E731,E125,E722
-exclude=build,test,setup,tool,.tox
+exclude=build,setup,tool,.tox,connector_python3
 max-line-length = 120
 show-source = true

setup.py

@@ -12,7 +12,7 @@
 
 try:
     from generated_version import VERSION
-except:
+except ImportError:
     from version import VERSION
 version = '.'.join([str(v) for v in VERSION if v is not None])
 

snowdialect.py

@@ -299,7 +299,7 @@ def _get_schema_foreign_keys(self, connection, schema, **kw):
                 foreign_key_map[name]['referred_columns'].append(self.normalize_name(row['pk_column_name']))
 
         ans = {}
-        for k, v in iteritems(foreign_key_map):
+        for _, v in iteritems(foreign_key_map):
             if v['table_name'] not in ans:
                 ans[v['table_name']] = []
             ans[v['table_name']].append({k2: v2 for k2, v2 in iteritems(v) if k2 != 'table_name'})
@@ -540,7 +540,7 @@ def get_view_definition(self, connection, view_name, schema=None, **kw):
             ret = cursor.fetchone()
             if ret:
                 return ret[n2i['text']]
-        except:
+        except Exxception:
             pass
         return None
 

sqlalchemy_python2

@@ -21,7 +21,7 @@ Find the ``snowflake-sqlalchemy*.whl`` package in the ``./dist`` directory.
 Testing
 ================================================================================
 
-Create a virtualenv, with ``parameters.py`` in a test directory. 
+Create a virtualenv, with ``parameters.py`` in a test directory.
 
     .. code-block:: bash
 

test/README.rst

@@ -11,12 +11,11 @@
 from logging import getLogger
 
 import pytest
-from parameters import (CONNECTION_PARAMETERS)
-from sqlalchemy import create_engine
-
 import snowflake.connector
-from snowflake.connector.compat import TO_UNICODE, IS_WINDOWS
+from parameters import CONNECTION_PARAMETERS
+from snowflake.connector.compat import IS_WINDOWS, TO_UNICODE
 from snowflake.sqlalchemy import URL, dialect
+from sqlalchemy import create_engine
 
 if os.getenv('TRAVIS') == 'true':
     TEST_SCHEMA = 'TRAVIS_JOB_{0}'.format(os.getenv('TRAVIS_JOB_ID'))
@@ -65,10 +64,12 @@ def help():
     'port': '443',
 }
 
+
 @pytest.fixture(scope='session')
 def db_parameters():
     return get_db_parameters()
 
+
 def get_db_parameters():
     """
     Sets the db connection parameters
@@ -167,7 +168,7 @@ def init_test_schema(request, db_parameters):
             protocol=ret['protocol']
     ) as con:
         con.cursor().execute(
-            "CREATE SCHEMA IF NOT EXISTS {0}".format(TEST_SCHEMA))
+            "CREATE SCHEMA IF NOT EXISTS {}".format(TEST_SCHEMA))
 
     def fin():
         ret1 = db_parameters

test/conftest.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from sqlalchemy import Integer, String, and_, select
-from sqlalchemy.sql import column, table, quoted_name
+from sqlalchemy.sql import column, quoted_name, table
 from sqlalchemy.testing import AssertsCompiledSQL
 
 table1 = table(