Latest release: 2.2.1

Author: bernhard-42

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.0
+current_version = 2.2.1
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-{0,1}(?P<release>\D*)(?P<build>\d*)

HISTORY.md

@@ -1,3 +1,8 @@
+### V2.2.1 (June 2021)
+
+- **Support of Databricks Runtimes 6.4(ESR) and 7.3, 7.6, 8.0, 8.1, 8.2, 8.3 (both standard and ML)**
+- Security fixes for the Javascript Jupyterlab extension of ssh_ipykernel and databrickslabs-jupyterlab
+
 ### V2.2.0 (Apr 2021)
 
 - **Jupyter Lab support** 

README.md

@@ -2,6 +2,11 @@
 
 This package allows to connect to a remote Databricks cluster from a locally running JupyterLab.
 
+## >>> New minor release V2.2.1 (June 2021) <<<
+
+- Support of Databricks Runtimes 6.4(ESR) and 7.3, 7.6, 8.0, 8.1, 8.2, 8.3 (both standard and ML)
+- Upgrade to ssh_ipykernel 1.2.3 (security fixes for the Javascript Jupyterlab extension of ssh_ipykernel)
+- Security fixes for the Javascript Jupyterlab extension of databrickslabs-jupyterlab
 
 ## >>> New minor release V2.2 (Apr 2021) <<<
 
@@ -14,7 +19,7 @@ This package allows to connect to a remote Databricks cluster from a locally run
     ```bash
     (base)$ conda create -n dj python=3.8  # you might need to add "pywin32" if you are on Windows
     (base)$ conda activate dj
-    (dj)$ pip install --upgrade databrickslabs-jupyterlab[cli]==2.2.0
+    (dj)$ pip install --upgrade databrickslabs-jupyterlab[cli]==2.2.1
     ```
 
     The following packages get installed:
@@ -83,7 +88,7 @@ This package allows to connect to a remote Databricks cluster from a locally run
 
 ## 4 Running with docker
 
-A docker image ready for working with *Jupyterlab Integration* is available from Dockerhub. It is recommended to prepare your environment by pulling the repository: `docker pull bwalter42/databrickslabs_jupyterlab:2.2.0`
+A docker image ready for working with *Jupyterlab Integration* is available from Dockerhub. It is recommended to prepare your environment by pulling the repository: `docker pull bwalter42/databrickslabs_jupyterlab:2.2.1`
 
 There are two scripts in the folder `docker`:
 
@@ -103,7 +108,7 @@ Alternatively, under macOS and Linux one can use the following bash functions:
             -v $HOME/.ssh/:/home/dbuser/.ssh  \
             -v $HOME/.databrickscfg:/home/dbuser/.databrickscfg \
             -v $(pwd):/home/dbuser/notebooks \
-            bwalter42/databrickslabs_jupyterlab:2.2.0 /opt/conda/bin/databrickslabs-jupyterlab $@
+            bwalter42/databrickslabs_jupyterlab:2.2.1 /opt/conda/bin/databrickslabs-jupyterlab $@
     }
     ```
 
@@ -118,7 +123,7 @@ Alternatively, under macOS and Linux one can use the following bash functions:
             -v $HOME/.ssh/:/home/dbuser/.ssh  \
             -v $HOME/.databrickscfg:/home/dbuser/.databrickscfg \
             -v $(pwd):/home/dbuser/notebooks \
-            bwalter42/databrickslabs_jupyterlab:2.2.0 /opt/conda/bin/jupyter $@
+            bwalter42/databrickslabs_jupyterlab:2.2.1 /opt/conda/bin/jupyter $@
     }
     ```
 
@@ -166,7 +171,7 @@ in both commands.
     ```bash
     (base)$ conda create -n dj python=3.8  # you might need to add "pywin32" if you are on Windows
     (base)$ conda activate dj
-    (dj)$   pip install --upgrade databrickslabs-jupyterlab[cli]==2.2.0
+    (dj)$   pip install --upgrade databrickslabs-jupyterlab[cli]==2.2.1
     ```
 
     The prefix `(db-jlab)$` for all command examples in this document assumes that the conda enviromnent `db-jlab` is activated.

databrickslabs_jupyterlab/_version.py

@@ -12,5 +12,5 @@ def get_version(version):
     return VersionInfo(major, minor, patch, release, build)
 
 
-__version__ = "2.2.0"  # DO NOT EDIT THIS DIRECTLY!  It is managed by bumpversion
+__version__ = "2.2.1"  # DO NOT EDIT THIS DIRECTLY!  It is managed by bumpversion
 __version_info__ = get_version(__version__)

databrickslabs_jupyterlab/connect.py

@@ -26,12 +26,31 @@
 
 from pyspark.conf import SparkConf  # pylint: disable=import-error,wrong-import-position
 
+NEW_DBUTILS = False
+
 with warnings.catch_warnings():
     warnings.simplefilter("ignore")
     # Suppress py4j loading message on stderr by redirecting sys.stderr
     stderr_orig = sys.stderr
     sys.stderr = io.StringIO()
-    from PythonShell import get_existing_gateway, RemoteContext  # pylint: disable=import-error
+    try:
+        # Up to DBR 7.x
+        from PythonShell import get_existing_gateway, RemoteContext  # pylint: disable=import-error,wrong-import-position
+    except:
+        # Above DBR 8.0
+        sys.path.insert(0, "/databricks/python_shell")
+        sys.path.insert(0, "/databricks/python_shell/scripts/")
+
+        from dbruntime.spark_connection import RemoteContext, get_existing_gateway  # pylint: disable=import-error,wrong-import-position
+
+    try:
+        # up to DBR 8.2
+        from dbutils import DBUtils  # pylint: disable=import-error,wrong-import-position
+        NEW_DBUTILS = False
+    except:
+        # above DBR 8.3
+        from dbruntime.dbutils import DBUtils  # pylint: disable=import-error,wrong-import-position
+        NEW_DBUTILS = True
 
     out = sys.stderr.getvalue()
     # Restore sys.stderr
@@ -40,8 +59,6 @@
     if not "py4j imported" in out:
         print(out, file=sys.stderr)
 
-from dbutils import DBUtils  # pylint: disable=import-error,wrong-import-position
-
 
 class JobInfo:
     """Job info class for Spark jobs
@@ -109,8 +126,13 @@ def new_group_id(self):
 
 
 class DbjlUtils:
-    def __init__(self, shell, entry_point):
-        self._dbutils = DBUtils(shell, entry_point)
+    def __init__(self, shell, entry_point, sc, sqlContext, displayHTML):
+        # ugly, but not possible to differentiate <= 8.2 from >= 8.3
+        try:
+            self._dbutils = DBUtils(shell, entry_point)
+        except:
+            self._dbutils = DBUtils(shell, entry_point, sc, sqlContext, displayHTML)
+
         self.fs = self._dbutils.fs
         self.secrets = self._dbutils.secrets
         self.notebook = Notebook()
@@ -464,7 +486,7 @@ def get_config(self):  # pylint: disable=unused-argument
 
     # Initialize dbutils
     #
-    dbutils = DbjlUtils(shell, entry_point)
+    dbutils = DbjlUtils(shell, entry_point, sc, sqlContext, shell.displayHTML)
 
     # Setting up Spark progress bar
     #

databrickslabs_jupyterlab_status/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.0
+current_version = 2.2.1
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-{0,1}(?P<release>\D*)(?P<build>\d*)