Merge pull request #605 from parente/tornado5

Remove tornado<5 pin

base-notebook/Dockerfile

@@ -77,13 +77,11 @@ 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.4.*' \
     'jupyterhub=0.8.*' \
-    'jupyterlab=0.31.*' \
-    'tornado=4.*' \
-    && conda clean -tipsy && \
+    'jupyterlab=0.31.*' && \
+    conda clean -tipsy && \
     jupyter labextension install @jupyterlab/hub-extension@^0.8.0 && \
     npm cache clean && \
     rm -rf $CONDA_DIR/share/jupyter/lab/staging && \

pyspark-notebook/Dockerfile

@@ -15,11 +15,6 @@ RUN apt-get -y update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Install pyarrow
-RUN conda install --quiet -y 'pyarrow' && \
-    fix-permissions $CONDA_DIR && \
-    fix-permissions /home/$NB_USER
-
 RUN cd /tmp && \
         wget -q http://apache.claz.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz && \
         echo "258683885383480BA01485D6C6F7DC7CFD559C1584D6CEB7A3BBCF484287F7F57272278568F16227BE46B4F92591768BA3D164420D87014A136BF66280508B46 *spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" | sha512sum -c - && \
@@ -45,3 +40,8 @@ ENV MESOS_NATIVE_LIBRARY /usr/local/lib/libmesos.so
 ENV SPARK_OPTS --driver-java-options=-Xms1024M --driver-java-options=-Xmx4096M --driver-java-options=-Dlog4j.logLevel=info
 
 USER $NB_UID
+
+# Install pyarrow
+RUN conda install --quiet -y 'pyarrow' && \
+    fix-permissions $CONDA_DIR && \
+    fix-permissions /home/$NB_USER