FIX support the latest pymysql (#75)

pymysql 0.8 introduced some backward incompatible changes,
so let's upgrade the usage here

Author: drudim

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.8.2
+* Support 0.9.x `pymysql` in `sparkly.testing.MysqlFixture`
+
 ## 2.8.1
 * Fix support for using multiple sparkly sessions during tests
 * SparklySession does not persist modifications to os.environ

requirements_docs.txt

@@ -22,6 +22,6 @@ pytest-cov==2.3.1
 Sphinx==1.4.6
 sphinx_rtd_theme==0.1.9
 cassandra-driver==3.7.1
-PyMySQL==0.7.9
+PyMySQL==0.9.3
 kafka-python==1.2.2
 -e git+https://github.com/Tubular/spark@branch-2.1.0#egg=pyspark&subdirectory=python

requirements_extras.txt

@@ -15,7 +15,7 @@
 #
 
 cassandra-driver==3.7.1
-PyMySQL==0.7.9
+PyMySQL==0.9.3
 kafka-python==1.2.2
 redis==2.10.5
 ujson==1.35

setup.py

@@ -93,6 +93,6 @@
     extras_require={
         'kafka': ['kafka-python>=1.2.2,<1.3'],
         'redis': ['redis>=2.10,<3', 'ujson>=1.33,<2'],
-        'test': ['cassandra-driver>=3.7,<3.8', 'PyMySQL>=0.7,<0.8', 'kafka-python>=1.2.2,<1.3', 'redis>=2.10,<3', 'ujson>=1.33,<2'],
+        'test': ['cassandra-driver>=3.7,<3.8', 'PyMySQL>=0.7,<0.10', 'kafka-python>=1.2.2,<1.3', 'redis>=2.10,<3', 'ujson>=1.33,<2'],
     },
 )

sparkly/__init__.py

@@ -19,4 +19,4 @@
 assert SparklySession
 
 
-__version__ = '2.8.1'
+__version__ = '2.8.2'

sparkly/testing.py

@@ -16,17 +16,14 @@
 
 import collections
 import contextlib
-import copy
 import difflib
 from functools import partial, total_ordering
 import importlib
 import json
 import logging
 import math
-import operator
 import os
 import pprint
-import shutil
 import signal
 import sys
 import tempfile
@@ -36,7 +33,6 @@
 
 from pyspark.context import SparkContext
 from pyspark.sql import types as T
-import six
 
 from sparkly import SparklySession
 from sparkly.exceptions import FixtureError
@@ -55,13 +51,10 @@
 
 try:
     import pymysql as connector
+    from pymysql.constants import CLIENT
     MYSQL_FIXTURES_SUPPORT = True
 except ImportError:
-    try:
-        import mysql.connector as connector
-        MYSQL_FIXTURES_SUPPORT = True
-    except ImportError:
-        MYSQL_FIXTURES_SUPPORT = False
+    MYSQL_FIXTURES_SUPPORT = False
 
 try:
     from kafka import KafkaProducer, SimpleClient
@@ -749,6 +742,8 @@ def _execute(self, statements):
             password=self.password,
             host=self.host,
             port=self.port,
+            program_name='sparkly',
+            client_flag=CLIENT.MULTI_STATEMENTS,
         )
         cursor = ctx.cursor()
         cursor.execute(statements)