REL - Merge pull request #78 from rapidsai/master

REL - [skip-ci] Sync main with master

Author: ajschmidt8

ci/release/update-version.sh

@@ -41,5 +41,5 @@ fi
 
 echo "Preparing '$RELEASE_TYPE' release [$CURRENT_TAG -> $NEXT_FULL_TAG]"
 
-jlpm config set version-tag-prefix ""
-jlpm version --no-git-tag-version --non-interactive --${RELEASE_TYPE} --new-version=${NEXT_FULL_TAG}
+jq -e --arg tag "$NEXT_FULL_TAG" '.version=$tag' package.json > package.json.tmp
+mv package.json.tmp package.json

conda/recipes/jupyterlab-nvdashboard/meta.yaml

@@ -17,18 +17,18 @@ build:
 
 requirements:
   build:
-    - python >=3
+    - python >=3.5
     - setuptools
-    - jupyter-server-proxy
-    - bokeh <2
     - pynvml
     - psutil
   run:
-    - python >=3
+    - python >=3.5
+    - jupyterlab >=2.0
     - jupyter-server-proxy
-    - bokeh <2
+    - bokeh >2.1
     - pynvml
     - psutil
+    - nodejs
 
 
 test:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyterlab-nvdashboard",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "A JupyterLab extension for displaying GPU usage dashboards",
   "keywords": [
     "jupyter",

requirements.txt

@@ -1,4 +1,4 @@
 jupyter-server-proxy
-bokeh<2
+bokeh>2.1
 pynvml
 psutil

setup.py

@@ -25,7 +25,7 @@
     description="A JupyterLab extension for displaying dashboards of GPU usage.",
     long_description=long_description,
     long_description_content_type='text/markdown',
-    license="BSD",
+    license="BSD-3-Clause",
     packages=setuptools.find_packages(),
         keywords=['Jupyter'],
         classifiers=['Framework :: Jupyter'],

yarn.lock

@@ -940,9 +940,9 @@ lodash.mergewith@^4.6.1:
   integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
 
 lodash@^4.17.15:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 [email protected]:
   version "2.2.0"