Merge pull request #275 from quantopian/update-dependencies

Update qgrid for jupyterlab
quantopian · Dec 31, 2019 · 538f08a · 538f08a
2 parents caec995 + bd691dd
commit 538f08a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/js/package.json b/js/package.json
@@ -25,8 +25,8 @@
     "webpack": "^3.5.5"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^1.0.0",
-    "@jupyter-widgets/controls": "^1.0.0",
+    "@jupyter-widgets/base": "^1.1 || ^2",
+    "@jupyter-widgets/controls": "^1.0.0 || ^1.5.1",
     "css-loader": "^0.28.7",
     "expose-loader": "^0.7.3",
     "file-loader": "^0.11.2",

diff --git a/js/src/qgrid.css b/js/src/qgrid.css
@@ -737,3 +737,7 @@ input.bool-filter-radio {
 .q-grid .slick-sort-indicator-asc {
   background-image: none;
 }
+
+.jupyter-widgets {
+  overflow: auto !important;
+}
diff --git a/qgrid/_version.py b/qgrid/_version.py
@@ -1,4 +1,4 @@
-version_info = (1, 1, 1, 'final')
+version_info = (1, 2, 0, 'final')
 
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}