From f31979e7137714c66cdd611c17b302581f0aed1a Mon Sep 17 00:00:00 2001 From: Michael Chin Date: Wed, 29 May 2024 22:36:02 -0700 Subject: [PATCH 1/3] Upgrade to ITables 2.x --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ade91972..12339484 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ setuptools>=65.5.1,<=66.0.0 nbconvert>=6.3.0,<=7.2.8 jedi>=0.18.1,<=0.18.2 markupsafe<2.1.0 -itables>=1.0.0,<=1.5.2,!=1.4.3,!=1.4.4 +itables>=2.0.0,<=2.1.0 pandas>=1.3.5,<=1.5.3 numpy<1.24.0 nest_asyncio>=1.5.5,<=1.5.6 diff --git a/setup.py b/setup.py index ea431d9a..8bcdacf5 100644 --- a/setup.py +++ b/setup.py @@ -87,7 +87,7 @@ def get_version(): 'ipyfilechooser==0.6.0', 'nbconvert>=6.3.0,<=7.2.8', 'jedi>=0.18.1,<=0.18.2', - 'itables>=1.0.0,<=1.5.2,!=1.4.3,!=1.4.4', + 'itables>=2.0.0,<=2.1.0', 'pandas>=1.3.5,<=1.5.3', 'numpy<1.24.0', 'nest_asyncio>=1.5.5,<=1.5.6' From ed99819acf3cdbf9c1fde0b855379d9ec91a501b Mon Sep 17 00:00:00 2001 From: Michael Chin Date: Wed, 29 May 2024 22:39:48 -0700 Subject: [PATCH 2/3] Move pagination menu to DataTables button --- src/graph_notebook/magics/graph_magic.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/graph_notebook/magics/graph_magic.py b/src/graph_notebook/magics/graph_magic.py index f83e1a70..cb34882a 100644 --- a/src/graph_notebook/magics/graph_magic.py +++ b/src/graph_notebook/magics/graph_magic.py @@ -915,7 +915,8 @@ def sparql(self, line='', cell='', local_ns: dict = None): paging=sparql_paging, scrollCollapse=sparql_scrollCollapse, lengthMenu=[final_pagination_options, final_pagination_menu], - pageLength=visible_results + pageLength=visible_results, + buttons=["pageLength"] ) elif first_tab_html != "": with first_tab_output: @@ -1267,7 +1268,8 @@ def gremlin(self, line, cell, local_ns: dict = None): paging=gremlin_paging, scrollCollapse=gremlin_scrollCollapse, lengthMenu=[final_pagination_options, final_pagination_menu], - pageLength=visible_results + pageLength=visible_results, + buttons=["pageLength"] ) else: # Explain/Profile display(HTML(first_tab_html)) @@ -2236,6 +2238,7 @@ def load_ids(self, line, local_ns: dict = None): scrollCollapse=True, lengthMenu=[DEFAULT_PAGINATION_OPTIONS, DEFAULT_PAGINATION_MENU], pageLength=10, + buttons=["pageLength"] ) with raw_output: @@ -3263,7 +3266,8 @@ def handle_opencypher_query(self, line, cell, local_ns): paging=oc_paging, scrollCollapse=oc_scrollCollapse, lengthMenu=[final_pagination_options, final_pagination_menu], - pageLength=visible_results + pageLength=visible_results, + buttons=["pageLength"] ) elif first_tab_html != "": with first_tab_output: From 578237f4dd67003e3a5481d33bd064dbaa086248 Mon Sep 17 00:00:00 2001 From: Michael Chin Date: Wed, 29 May 2024 22:45:25 -0700 Subject: [PATCH 3/3] update changelog --- ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.md b/ChangeLog.md index 6ae4d0c9..79fbb186 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -11,6 +11,7 @@ Starting with v1.31.6, this file will contain a record of major features and upd - Improved handling of mixed type Gremlin results ([Link to PR](https://github.com/aws/graph-notebook/pull/592)) - Upgraded `rdflib` to 7.0.0 and `SPARQLWrapper` to 2.0.0 ([Link to PR](https://github.com/aws/graph-notebook/pull/596)) - Upgraded `requests` to 2.32.x ([Link to PR](https://github.com/aws/graph-notebook/pull/600)) +- Upgraded `itables` to 2.x ([Link to PR](https://github.com/aws/graph-notebook/pull/601)) - Fixed formatting of query magic `--help` entries listing valid inputs ([Link to PR](https://github.com/aws/graph-notebook/pull/593)) - Fixed endpoint creation bug in People-Analytics-using-Neptune-ML sample ([Link to PR](https://github.com/aws/graph-notebook/pull/595)) - Fixed deprecated usage of Pandas `DataFrameGroupBy.mean` in NeptuneML SPARQL utils ([Link to PR](https://github.com/aws/graph-notebook/pull/596))