diff --git a/RELEASE.md b/RELEASE.md index b18cfe3..9d4b42f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,9 @@ # Release Notes +## 0.2.3 + +* Add version cap for jupyter-lsp + ## 0.2.1 * Upgrade to Fugue 0.8.0 diff --git a/fugue_jupyter/_constants.py b/fugue_jupyter/_constants.py index 37aed1d..8fd25bc 100644 --- a/fugue_jupyter/_constants.py +++ b/fugue_jupyter/_constants.py @@ -7,7 +7,7 @@ for (var i = 0; i < words.length; ++i) obj[words[i]] = true; return obj; } -var fugue_keywords = "system bernoulli reservoir approx fill hash rand even presort persist broadcast params process output outtransform rowcount concurrency prepartition zip print title save append parquet csv json single checkpoint weak strong deterministic yield connect sample seed take sub callback dataframe file"; +var fugue_keywords = "system bernoulli reservoir approx fill hash rand even coarse presort persist broadcast params process output outtransform rowcount concurrency prepartition zip print title save append parquet csv json single checkpoint weak strong deterministic yield connect sample seed take sub callback dataframe file"; CodeMirror.defineMIME("text/x-fsql", { name: "sql", keywords: set(fugue_keywords + " add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases data dbproperties defined delete delimited deny desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"), diff --git a/fugue_jupyter/nbextension/main.js b/fugue_jupyter/nbextension/main.js index 91a87e9..8dbf0f4 100644 --- a/fugue_jupyter/nbextension/main.js +++ b/fugue_jupyter/nbextension/main.js @@ -21,7 +21,7 @@ define([ return obj; } - var fugue_keywords = "system bernoulli reservoir approx fill hash rand even presort persist broadcast params process output outtransform rowcount concurrency prepartition zip print title save append parquet csv json single checkpoint weak strong deterministic yield connect sample seed take sub callback dataframe file"; + var fugue_keywords = "system bernoulli reservoir approx fill hash rand even coarse presort persist broadcast params process output outtransform rowcount concurrency prepartition zip print title save append parquet csv json single checkpoint weak strong deterministic yield connect sample seed take sub callback dataframe file"; function load_extension() { diff --git a/package.json b/package.json index 215b29a..2da4960 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fugue-jupyter", - "version": "0.2.2", + "version": "0.2.3", "description": "Jupyterlab Extension for Fugue", "keywords": [ "jupyter", diff --git a/requirements.txt b/requirements.txt index df96f55..37c23c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ twine jupyterlab jupyter-packaging -jupyterlab-lsp +jupyterlab-lsp<4 cookiecutter bleach>5.0.0 diff --git a/setup.py b/setup.py index bf1c304..8ddb67a 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ def get_version() -> str: "fugue>=0.8.0", "notebook", "jupyterlab>=3.0", - "jupyterlab-lsp", + "jupyterlab-lsp<4", "ipython>=7.10.0", ], zip_safe=False, diff --git a/src/utils.ts b/src/utils.ts index c9e14ac..c9e4889 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -91,7 +91,7 @@ function set(str: string) { } const fugue_keywords = - 'system bernoulli reservoir approx fill hash rand even presort persist broadcast params process output outtransform rowcount concurrency prepartition zip print title save append parquet csv json single checkpoint weak strong deterministic yield connect sample seed take sub callback dataframe file'; + 'system bernoulli reservoir approx fill hash rand even coarse presort persist broadcast params process output outtransform rowcount concurrency prepartition zip print title save append parquet csv json single checkpoint weak strong deterministic yield connect sample seed take sub callback dataframe file'; /** * Register text editor based on file type. diff --git a/tests/fugue_jupyter/test_notebook.ipynb b/tests/fugue_jupyter/test_notebook.ipynb index d758f93..e2c2083 100644 --- a/tests/fugue_jupyter/test_notebook.ipynb +++ b/tests/fugue_jupyter/test_notebook.ipynb @@ -283,7 +283,7 @@ } ], "source": [ - "%%fsql native+sqlite\n", + "%%fsql native+qpdpandas\n", "CREATE [[0]] SCHEMA a:int\n", "PRINT" ]