chore: fix deprecations and bump dependencies (#219)

Author: villebro

.pre-commit-config.yaml

@@ -1,12 +1,17 @@
 repos:
 -   repo: https://github.com/ambv/black
-    rev: stable
+    rev: 19.10b0
     hooks:
     -   id: black
         language_version: python3
 
+-   repo: https://github.com/asottile/seed-isort-config
+    rev: v2.1.1
+    hooks:
+    -   id: seed-isort-config
+
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v3.0.1
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -17,6 +22,6 @@ repos:
     -   id: debug-statements
 
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.1
+    rev: 3.8.2
     hooks:
     -   id: flake8

.travis.yml

@@ -3,8 +3,7 @@ matrix:
   include:
     - env: TOXENV=black
     - env: TOXENV=flake8
-    - env: TOXENV=py35
-      python: 3.5
+    - env: TOXENV=isort
     - env: TOXENV=py36
       python: 3.6
     - env: TOXENV=py37

docs/source/conf.py

@@ -12,8 +12,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

pydruid/async_client.py

@@ -13,11 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-from __future__ import division
-from __future__ import absolute_import
-
 import json
+
 from pydruid.client import BaseDruidClient
 
 try:

pydruid/client.py

@@ -13,17 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from __future__ import division
-from __future__ import absolute_import
-
 import json
 import re
-
-from six.moves import urllib
-
-from pydruid.query import QueryBuilder
+import urllib
 from base64 import b64encode
 
+from pydruid.query import QueryBuilder
 
 # extract error from the <PRE> tag inside the HTML response
 HTML_ERROR = re.compile("<pre>\\s*(.*?)\\s*</pre>", re.IGNORECASE)

pydruid/console.py

@@ -1,22 +1,19 @@
-from __future__ import unicode_literals
-
 import os
 import re
 import sys
+from urllib import parse
 
-from prompt_toolkit import prompt, AbortAction
-from prompt_toolkit.history import FileHistory
+from prompt_toolkit import AbortAction, prompt
 from prompt_toolkit.contrib.completers import WordCompleter
+from prompt_toolkit.history import FileHistory
 from pygments.lexers import SqlLexer
 from pygments.style import Style
-from pygments.token import Token
 from pygments.styles.default import DefaultStyle
-from six.moves.urllib import parse
+from pygments.token import Token
 from tabulate import tabulate
 
 from pydruid.db.api import connect
 
-
 keywords = [
     "EXPLAIN PLAN FOR",
     "WITH",

pydruid/db/__init__.py

@@ -1,7 +1,7 @@
 from pydruid.db.api import connect
 from pydruid.db.exceptions import (
-    DataError,
     DatabaseError,
+    DataError,
     Error,
     IntegrityError,
     InterfaceError,
@@ -12,7 +12,6 @@
     Warning,
 )
 
-
 __all__ = [
     "connect",
     "apilevel",

pydruid/db/api.py

@@ -1,13 +1,7 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from collections import namedtuple, OrderedDict
 import itertools
 import json
-from six import string_types
-from six.moves.urllib import parse
+from collections import namedtuple, OrderedDict
+from urllib import parse
 
 import requests
 
@@ -110,7 +104,7 @@ def get_type(value):
     Note that bool is a subclass of int so order of statements matter.
     """
 
-    if isinstance(value, string_types) or value is None:
+    if isinstance(value, str) or value is None:
         return Type.STRING
     elif isinstance(value, bool):
         return Type.BOOLEAN
@@ -446,7 +440,7 @@ def escape(value):
 
     if value == "*":
         return value
-    elif isinstance(value, string_types):
+    elif isinstance(value, str):
         return "'{}'".format(value.replace("'", "''"))
     elif isinstance(value, bool):
         return "TRUE" if value else "FALSE"

pydruid/db/exceptions.py

@@ -1,9 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
 class Error(Exception):
     pass
 

pydruid/db/sqlalchemy.py

@@ -1,16 +1,10 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
+from sqlalchemy import types
 from sqlalchemy.engine import default
 from sqlalchemy.sql import compiler
-from sqlalchemy import types
 
 import pydruid.db
 from pydruid.db import exceptions
 
-
 RESERVED_SCHEMAS = ["INFORMATION_SCHEMA"]