Update dependency (#37)

* update doc and license * add comments for execution * update * update * update * update * update * update unit test * update unit test * finish docs * update * update
fugue-project · Jun 24, 2020 · 0286228 · 0286228
1 parent 753d232
commit 0286228
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/fugue/__init__.py b/fugue/__init__.py
@@ -1,6 +1,6 @@
 # flake8: noqa
 
-__version__ = "0.3.2"
+__version__ = "0.3.5"
 
 from triad.collections import Schema
 from triad.collections.fs import FileSystem

diff --git a/fugue_sql/_utils.py b/fugue_sql/_utils.py
@@ -1,8 +1,7 @@
-from jinjasql import JinjaSql
+from jinja2 import Template
 from typing import Dict, Any
 
 
 def fill_sql_template(sql: str, params: Dict[str, Any]):
-    sql = sql.replace("%", "%%")
-    query, bind = JinjaSql(param_style="pyformat").prepare_query(sql, params)
-    return query % bind
+    template = Template(sql)
+    return template.render(**params)
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-triad>=0.3.7
-adagio>=0.1.8
+triad>=0.3.8
+adagio>=0.2.0
 sqlalchemy
 pyspark>=3.0.0
 

diff --git a/setup.py b/setup.py
@@ -17,14 +17,14 @@
     author_email="goodwanghan@gmail.com",
     keywords="distributed spark dask sql dsl domain specific language",
     url="http://github.com/fugue-project/fugue",
-    install_requires=["triad>=0.3.7", "adagio>=0.1.8", "sqlalchemy"],
+    install_requires=["triad>=0.3.8", "adagio>=0.2.0", "sqlalchemy"],
     extras_require={
-        "sql": ["antlr4-python3-runtime", "jinjasql"],
+        "sql": ["antlr4-python3-runtime", "jinja2"],
         "spark": ["pyspark"],
         "dask": ["dask[dataframe]", "cloudpickle>=1.4.0"],
         "all": [
             "antlr4-python3-runtime",
-            "jinjasql",
+            "jinja2",
             "pyspark",
             "dask[dataframe]",
             "cloudpickle>=1.4.0",