Notebook 5.4, force tornado 4.* at the outset

all-spark-notebook/Dockerfile

@@ -23,7 +23,6 @@ USER $NB_UID
 
 # R packages
 RUN conda install --quiet --yes \
-    'tornado<5' \
     'r-base=3.4.1' \
     'r-irkernel=0.8*' \
     'r-ggplot2=2.2*' \

base-notebook/Dockerfile

@@ -77,10 +77,12 @@ RUN cd /tmp && \
     fix-permissions /home/$NB_USER
 
 # Install Jupyter Notebook and Hub
+# Issue #589: Force tornado < 5.0 until various zmq dependencies are resolved upstream
 RUN conda install --quiet --yes \
-    'notebook=5.2.*' \
+    'notebook=5.4.*' \
     'jupyterhub=0.8.*' \
     'jupyterlab=0.31.*' \
+    'tornado=4.*' \
     && conda clean -tipsy && \
     jupyter labextension install @jupyterlab/hub-extension@^0.8.0 && \
     npm cache clean && \

datascience-notebook/Dockerfile

@@ -42,7 +42,6 @@ USER $NB_UID
 RUN conda config --system --append channels r && \
     conda install --quiet --yes \
     'rpy2=2.8*' \
-    'tornado<5' \
     'r-base=3.4.1' \
     'r-irkernel=0.8*' \
     'r-plyr=1.8*' \

r-notebook/Dockerfile

@@ -18,9 +18,7 @@ RUN apt-get update && \
 USER $NB_UID
 
 # R packages
-# Force tornado<5 for #589
 RUN conda install --quiet --yes \
-    'tornado<5' \
     'r-base=3.4.1' \
     'r-irkernel=0.8*' \
     'r-plyr=1.8*' \