[TWTR][AIRFLOW-XXXX] Cherry-pick AIRFLOW-4501 and bump version (apach…

…e#20)
rajatsri28 · Oct 30, 2019 · 14d3d39 · 14d3d39
1 parent 0a522c1
commit 14d3d39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/airflow/settings.py b/airflow/settings.py
@@ -209,6 +209,11 @@ def configure_adapters():
         MySQLdb.converters.conversions[Pendulum] = MySQLdb.converters.DateTime2literal
     except ImportError:
         pass
+    try:
+        import pymysql.converters
+        pymysql.converters.conversions[Pendulum] = pymysql.converters.escape_datetime
+    except ImportError:
+        pass
 
 
 def configure_action_logging():

diff --git a/airflow/version.py b/airflow/version.py
@@ -18,4 +18,4 @@
 # under the License.
 #
 
-version = '1.10.0+twtr19'
+version = '1.10.0+twtr20'