Merge pull request #10 from fcollonval/maintenance/bump-ipywidgets

twosigma · Oct 16, 2023 · 122b264 · 122b264
2 parents 9a97e5f + 79d5243
commit 122b264
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 31 deletions.
diff --git a/beakerx_base/beakerx_widgets.py b/beakerx_base/beakerx_widgets.py
@@ -82,18 +82,6 @@ def __init__(self, **kwargs):
 
     layout = InstanceDict(BeakerxLayout).tag(sync=True, **widget_serialization)
 
-    def _ipython_display_(self, **kwargs):
-        data = {
-            'application/vnd.jupyter.widget-view+json': {
-                'version_major': 2,
-                'version_minor': 0,
-                'model_id': self._model_id
-            }
-        }
-        display(data, raw=True)
-
-        self._handle_displayed(**kwargs)
-
 
 class BeakerxBox(Box):
     def __init__(self, **kwargs):
@@ -107,22 +95,11 @@ def __init__(self, **kwargs):
 
     layout = InstanceDict(BeakerxLayout).tag(sync=True, **widget_serialization)
 
-    def _ipython_display_(self, **kwargs):
-        data = {
-            'application/vnd.jupyter.widget-view+json': {
-                'version_major': 2,
-                'version_minor': 0,
-                'model_id': self._model_id
-            },
-            'method': 'display_data'
-        }
-
+    def _repr_mimebundle_(self, **kwargs):
         for component in self.components:
             self.components[component].fireInit()
-
-        display(data, raw=True)
-
-        self._handle_displayed(**kwargs)
+
+        return super(BeakerxBox, self)._repr_mimebundle_(**kwargs)
 
 
 class BeakerxTextArea(Textarea, EasyFormComponent):

diff --git a/setup.py b/setup.py
@@ -43,18 +43,23 @@
         'Intended Audience :: Science/Research',
         'Topic :: Multimedia :: Graphics',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7'
+        'Programming Language :: Python :: 3.8'
+        'Programming Language :: Python :: 3.9'
+        'Programming Language :: Python :: 3.10'
+        'Programming Language :: Python :: 3.11'
     ],
     python_requires='>=3',
     install_requires=[
-        'ipywidgets>=7.5.1,<8'
+        'ipywidgets>=7.5.1,<9',
         'pandas',
         'pytz'
     ],
+    extras_require={
+        'test': [
+            'pytest'
+        ]
+    },
     zip_safe=False,
     include_package_data=True,
     packages=find_packages(),