Skip to content

Commit

Permalink
Merge pull request #8 from fugue-project/0.2.3
Browse files Browse the repository at this point in the history
Add version cap to jupyter-lsp
  • Loading branch information
goodwanghan authored Apr 3, 2023
2 parents 6a5934f + cf0c96a commit baa6d19
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes

## 0.2.3

* Add version cap for jupyter-lsp

## 0.2.1

* Upgrade to Fugue 0.8.0
Expand Down
2 changes: 1 addition & 1 deletion fugue_jupyter/_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion fugue_jupyter/nbextension/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fugue-jupyter",
"version": "0.2.2",
"version": "0.2.3",
"description": "Jupyterlab Extension for Fugue",
"keywords": [
"jupyter",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ twine

jupyterlab
jupyter-packaging
jupyterlab-lsp
jupyterlab-lsp<4
cookiecutter
bleach>5.0.0

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tests/fugue_jupyter/test_notebook.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
}
],
"source": [
"%%fsql native+sqlite\n",
"%%fsql native+qpdpandas\n",
"CREATE [[0]] SCHEMA a:int\n",
"PRINT"
]
Expand Down

0 comments on commit baa6d19

Please sign in to comment.