diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000000000000000000000000000000000000..5129885bfe4d40c74eb65a238968b0e3d1915bb9 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,48 @@ +# file GENERATED by distutils, do NOT edit +LICENSE.txt +README.md +package.json +pvlink.json +pytest.ini +setup.cfg +setup.py +setupbase.py +tsconfig.json +webpack.config.js +docs/Makefile +docs/environment.yml +docs/make.bat +docs/source/conf.py +docs/source/develop-install.rst +docs/source/index.rst +docs/source/installing.rst +docs/source/introduction.rst +docs/source/_static/embed-bundle.js +docs/source/_static/embed-bundle.js.map +docs/source/_static/helper.js +docs/source/examples/index.rst +docs/source/examples/introduction.nblink +examples/introduction.ipynb +examples/.ipynb_checkpoints/introduction-checkpoint.ipynb +pvlink/__init__.py +pvlink/_frontend.py +pvlink/_version.py +pvlink/remoterenderer.py +pvlink/labextension/pvlink-0.1.7.tgz +pvlink/nbextension/__init__.py +pvlink/nbextension/static/extension.js +pvlink/nbextension/static/index.js +pvlink/nbextension/static/index.js.map +pvlink/tests/__init__.py +pvlink/tests/conftest.py +pvlink/tests/test_example.py +pvlink/tests/test_nbextension_path.py +src/extension.ts +src/index.ts +src/plugin.ts +src/version.ts +src/widget.ts +tests/karma.conf.js +tests/tsconfig.json +tests/src/index.spec.ts +tests/src/utils.spec.ts diff --git a/css/widget.css b/css/widget.css index d35a8cf455bee22202985b0898d0ee8caf181de9..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 --- a/css/widget.css +++ b/css/widget.css @@ -1,3 +1 @@ -.custom-widget { - min-height: 300px; -} + diff --git a/examples/introduction.ipynb b/examples/introduction.ipynb index a5ce9ac1ac560a25012016a41cc254df013e89bf..6884d1034a190f73c686c37b3028ec8abd099119 100644 --- a/examples/introduction.ipynb +++ b/examples/introduction.ipynb @@ -43,7 +43,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "ba8637b51e554b23a06c0a4df51b4eca", + "model_id": "0c83cf6a85944beeb8e0e62d3576c8ab", "version_major": 2, "version_minor": 0 }, @@ -59,6 +59,46 @@ "display(w)" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Widgets scales with container size" + ] + }, + { + "cell_type": "code", + "execution_count": 4, + "metadata": {}, + "outputs": [], + "source": [ + "from ipywidgets import Box" + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [ + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "bc30c04151414d61aa52c616506580c4", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "Box(children=(RemoteRenderer(),), layout=Layout(height='500px'))" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "Box(children=[w], layout={'height':'500px'})" + ] + }, { "cell_type": "code", "execution_count": null, diff --git a/package-lock.json b/package-lock.json index 9ca84d89da3bc55756a78f2547af0857c8fcdaf7..e7c47c2abdb89aad84880761fa41dcffc2b3b192 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pvlink", - "version": "0.1.0", + "version": "0.1.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 51150608cc936b9121d6531bc57cd822fc17b50c..9ee8280f59c4a2b76541016a5589d50e26f70a61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pvlink", - "version": "0.1.0", + "version": "0.1.1", "description": "ParaView-Web RemoteRenderer in Jupyter", "keywords": [ "jupyter", diff --git a/pvlink/_version.py b/pvlink/_version.py index fdb1be357a757978d8a6036dbfe2dc914f5e5d40..8ae846d52817e3b73b43527087697c3097c1497c 100644 --- a/pvlink/_version.py +++ b/pvlink/_version.py @@ -4,5 +4,5 @@ # Copyright (c) Juelich Supercomputing Centre (JSC). # Distributed under the terms of the Modified BSD License. -version_info = (0, 1, 0, 'dev') +version_info = (0, 1, 1, 'dev') __version__ = ".".join(map(str, version_info)) diff --git a/setup.py b/setup.py index c1e6cdfd1108d7f32c99df5eef489b2b6b3e5d40..e9c822f87ef6656bbf6dd968b9b6af7e7ce53c68 100644 --- a/setup.py +++ b/setup.py @@ -60,19 +60,20 @@ cmdclass['jsdeps'] = combine_commands( setup_args = dict( - name = name, - description = 'ParaView-Web RemoteRenderer in Jupyter', - version = version, - scripts = glob(pjoin('scripts', '*')), - cmdclass = cmdclass, - packages = find_packages(), - author = 'Juelich Supercomputing Centre (JSC)', - author_email = 'a.grosch@fz-juelich.de', - url = 'https://github.com//pvlink', - license = 'BSD', - platforms = "Linux, Mac OS X, Windows", - keywords = ['Jupyter', 'Widgets', 'IPython'], - classifiers = [ + name = name, + description = 'ParaView-Web RemoteRenderer in Jupyter', + long_description = 'ParaView-Web RemoteRenderer in Jupyter', + version = version, + scripts = glob(pjoin('scripts', '*')), + cmdclass = cmdclass, + packages = find_packages(), + author = 'Juelich Supercomputing Centre (JSC)', + author_email = 'a.grosch@fz-juelich.de', + url = 'https://gitlab.version.fz-juelich.de/jupyter4jsc/j4j_extras/pvlink', + license = 'BSD', + platforms = "Linux, Mac OS X, Windows", + keywords = ['Jupyter', 'Widgets', 'IPython'], + classifiers = [ 'Intended Audience :: Developers', 'Intended Audience :: Science/Research', 'License :: OSI Approved :: BSD License', diff --git a/src/widget.ts b/src/widget.ts index 1061eb3bcea5ed33754bb909d4c2fbec21d5cbe3..30ddd1b3eebf272275001adb8fca5ef31ac73975 100644 --- a/src/widget.ts +++ b/src/widget.ts @@ -12,10 +12,10 @@ import { // Import the CSS import '../css/widget.css' -import { ParaViewWebClient } from 'paraviewweb/src/IO/WebSocket/ParaViewWebClient'; -import { RemoteRenderer } from 'paraviewweb/src/NativeUI/Canvas/RemoteRenderer'; -import { SizeHelper } from "paraviewweb/src/Common/Misc/SizeHelper"; -import { SmartConnect } from 'wslink/src/SmartConnect'; +import SmartConnect from 'wslink/src/SmartConnect'; +import RemoteRenderer from 'paraviewweb/src/NativeUI/Canvas/RemoteRenderer'; +import SizeHelper from 'paraviewweb/src/Common/Misc/SizeHelper'; +import ParaViewWebClient from 'paraviewweb/src/IO/WebSocket/ParaViewWebClient'; export