From 4257cc9305a144868ac22c6ae05938c97d393cc9 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 20 Jan 2016 14:00:34 +0100 Subject: [PATCH 1/3] run notebook tests instead of IPython tests --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6bee73f6b..73446c7e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,13 +93,11 @@ RUN BUILD_DEPS="nodejs-legacy npm" && \ -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $BUILD_DEPS # Run tests. -RUN pip2 install --no-cache-dir mock nose requests testpath && \ - pip3 install --no-cache-dir nose requests testpath && \ +RUN pip3 install --no-cache-dir notebook[test] && \ \ - iptest2 && iptest3 && \ + nosetests notebook && \ \ - pip2 uninstall -y funcsigs mock nose pbr requests six testpath && \ - pip3 uninstall -y nose requests testpath && \ + pip3 uninstall -y nose requests && \ rm -rf /root/.cache # Add a notebook profile. From 001b3b7936a95c033579d1c5291de1069dda83d0 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 20 Jan 2016 14:00:39 +0100 Subject: [PATCH 2/3] install widgets --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 73446c7e2..632edd469 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,8 @@ RUN BUILD_DEPS="nodejs-legacy npm" && \ apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install -yq $BUILD_DEPS && \ \ - pip3 install --no-cache-dir --pre -e /usr/src/jupyter-notebook && \ + pip3 install --no-cache-dir /usr/src/jupyter-notebook && \ + pip3 install ipywidgets && \ \ npm cache clean && \ apt-get clean && \ From 0e6b1782e5adf90b6e3b791737835e2d8f2fe2e3 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 20 Jan 2016 15:56:15 +0100 Subject: [PATCH 3/3] don't remove requests it's a pointless waste --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 632edd469..80f3d0352 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,7 +60,6 @@ RUN curl -O https://bootstrap.pypa.io/get-pip.py && \ rm get-pip.py && \ pip2 --no-cache-dir install requests[security] && \ pip3 --no-cache-dir install requests[security] && \ - rm get-pip.py && \ rm -rf /root/.cache # Install some dependencies. @@ -94,12 +93,7 @@ RUN BUILD_DEPS="nodejs-legacy npm" && \ -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false $BUILD_DEPS # Run tests. -RUN pip3 install --no-cache-dir notebook[test] && \ - \ - nosetests notebook && \ - \ - pip3 uninstall -y nose requests && \ - rm -rf /root/.cache +RUN pip3 install --no-cache-dir notebook[test] && nosetests notebook # Add a notebook profile. RUN mkdir -p -m 700 /root/.jupyter/ && \