Merge pull request #217 from parente/various-tuneups

Various tuneups

all-spark-notebook/Dockerfile

@@ -28,5 +28,5 @@ RUN conda config --add channels r && \
     'r-rcurl=1.95*' && conda clean -tipsy
 
 # Apache Toree kernel
-RUN pip install toree==0.1.0.dev7
+RUN pip --no-cache-dir install toree==0.1.0.dev7
 RUN jupyter toree install --user

all-spark-notebook/README.md

@@ -241,8 +241,17 @@ You can return to the default environment with this command:
 source deactivate
 ```
 
-The commands `ipython`, `python`, `pip`, `easy_install`, and `conda` (among others) are available in both environments.
+The commands `jupyter`, `ipython`, `python`, `pip`, `easy_install`, and `conda` (among others) are available in both environments. For convenience, you can install packages into either environment regardless of what environment is currently active using commands like the following:
 
+```
+# install a package into the python2 environment
+pip2 install some-package
+conda install -n python2 some-package
+
+# install a package into the default (python 3.x) environment
+pip3 install some-package
+conda install -n python3 some-package
+```
 
 ## JupyterHub
 

base-notebook/Dockerfile

@@ -35,6 +35,7 @@ ENV PATH $CONDA_DIR/bin:$PATH
 ENV SHELL /bin/bash
 ENV NB_USER jovyan
 ENV NB_UID 1000
+ENV HOME /home/$NB_USER
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.UTF-8
@@ -49,7 +50,7 @@ USER jovyan
 # Setup jovyan home directory
 RUN mkdir /home/$NB_USER/work && \
     mkdir /home/$NB_USER/.jupyter && \
-    mkdir /home/$NB_USER/.local && \
+    mkdir -p -m 700 /home/$NB_USER/.local/share/jupyter && \
     echo "cacert=/etc/ssl/certs/ca-certificates.crt" > /home/$NB_USER/.curlrc
 
 # Install conda as jovyan
@@ -69,7 +70,7 @@ RUN conda install --quiet --yes \
     && conda clean -tipsy
 
 # Install JupyterHub to get the jupyterhub-singleuser startup script
-RUN pip install 'jupyterhub==0.5'
+RUN pip --no-cache-dir install 'jupyterhub==0.5'
 
 USER root
 

datascience-notebook/README.md

@@ -70,7 +70,17 @@ You can return to the default environment with this command:
 source deactivate
 ```
 
-The commands `ipython`, `python`, `pip`, `easy_install`, and `conda` (among others) are available in both environments.
+The commands `jupyter`, `ipython`, `python`, `pip`, `easy_install`, and `conda` (among others) are available in both environments. For convenience, you can install packages into either environment regardless of what environment is currently active using commands like the following:
+
+```
+# install a package into the python2 environment
+pip2 install some-package
+conda install -n python2 some-package
+
+# install a package into the default (python 3.x) environment
+pip3 install some-package
+conda install -n python3 some-package
+```
 
 
 ## JupyterHub

pyspark-notebook/Dockerfile

@@ -69,6 +69,9 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
     'scikit-learn=0.17*' \
     pyzmq \
     && conda clean -tipsy
+# Add shortcuts to distinguish pip for python2 and python3 envs
+RUN ln -s $CONDA_DIR/envs/python2/bin/pip $CONDA_DIR/bin/pip2 && \
+    ln -s $CONDA_DIR/bin/pip $CONDA_DIR/bin/pip3
 
 # Install Python 2 kernel spec into the Python 3 conda environment which
 # runs the notebook server

pyspark-notebook/README.md

@@ -143,8 +143,17 @@ You can return to the default environment with this command:
 source deactivate
 ```
 
-The commands `ipython`, `python`, `pip`, `easy_install`, and `conda` (among others) are available in both environments.
+The commands `jupyter`, `ipython`, `python`, `pip`, `easy_install`, and `conda` (among others) are available in both environments. For convenience, you can install packages into either environment regardless of what environment is currently active using commands like the following:
 
+```
+# install a package into the python2 environment
+pip2 install some-package
+conda install -n python2 some-package
+
+# install a package into the default (python 3.x) environment
+pip3 install some-package
+conda install -n python3 some-package
+```
 
 ## JupyterHub
 

scipy-notebook/Dockerfile

@@ -59,6 +59,9 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
     'h5py=2.5*' \
     'pyzmq' \
     && conda clean -tipsy
+# Add shortcuts to distinguish pip for python2 and python3 envs
+RUN ln -s $CONDA_DIR/envs/python2/bin/pip $CONDA_DIR/bin/pip2 && \
+    ln -s $CONDA_DIR/bin/pip $CONDA_DIR/bin/pip3
 
 USER root
 

scipy-notebook/README.md

@@ -67,8 +67,17 @@ You can return to the default environment with this command:
 source deactivate
 ```
 
-The commands `ipython`, `python`, `pip`, `easy_install`, and `conda` (among others) are available in both environments.
+The commands `jupyter`, `ipython`, `python`, `pip`, `easy_install`, and `conda` (among others) are available in both environments. For convenience, you can install packages into either environment regardless of what environment is currently active using commands like the following:
 
+```
+# install a package into the python2 environment
+pip2 install some-package
+conda install -n python2 some-package
+
+# install a package into the default (python 3.x) environment
+pip3 install some-package
+conda install -n python3 some-package
+```
 
 ## JupyterHub