diff --git a/.prettierignore b/.prettierignore index 2145c5c7a9..3972407a86 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,4 +3,5 @@ build/ node_modules/ target/ .emsdk/ -boost*/ \ No newline at end of file +boost*/ +py_modules/ \ No newline at end of file diff --git a/cmake/arrow/CMakeLists.txt b/cmake/arrow/CMakeLists.txt index 4682ebc52f..6521b8a56d 100644 --- a/cmake/arrow/CMakeLists.txt +++ b/cmake/arrow/CMakeLists.txt @@ -210,7 +210,7 @@ set(ARROW_SRCS # ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/task_util.cc ) -if(PSP_PYTHON_BUILD) +if(PSP_PYTHON_BUILD AND NOT PSP_PYODIDE) set(ARROW_SRCS ${ARROW_SRCS} # use standard reader in Python builds. diff --git a/packages/perspective-jupyterlab/src/less/index.less b/packages/perspective-jupyterlab/src/less/index.less index aff7b85b01..d77b232cf4 100644 --- a/packages/perspective-jupyterlab/src/less/index.less +++ b/packages/perspective-jupyterlab/src/less/index.less @@ -14,13 +14,17 @@ div.PSPContainer { overflow: auto; - resize: both; padding-right: 5px; padding-bottom: 5px; height: 100%; + width: 100%; flex: 1; } +.jp-Notebook div.PSPContainer { + resize: vertical; +} + // Widget height for Jupyterlab .jp-NotebookPanel-notebook div.PSPContainer { height: 520px; @@ -32,11 +36,6 @@ div.PSPContainer { margin: auto; } -// Widget height for Voila -.jp-OutputArea-output div.PSPContainer { - height: 520px; -} - // Widget height for Jupyter Notebook .jupyter-widgets-view div.PSPContainer { height: 520px; diff --git a/python/perspective/setup.py b/python/perspective/setup.py index f17f9ba3ce..77cc6dca03 100644 --- a/python/perspective/setup.py +++ b/python/perspective/setup.py @@ -311,6 +311,11 @@ def run_check(self): "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Framework :: Jupyter :: JupyterLab", + "Framework :: Jupyter :: JupyterLab :: 3", + "Framework :: Jupyter :: JupyterLab :: Extensions", + "Framework :: Jupyter :: JupyterLab :: Extensions :: Mime Renderers", + "Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt", ], keywords="analytics tools plotting", packages=find_packages(exclude=["bench", "bench.*"]),