From 5eca3cae6c7e8bfd751b0fc70295304b8d38a1d3 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 9 Jul 2019 10:46:25 +0200 Subject: [PATCH] stop removing qt it makes the conda env invalid, which causes errors in later installs --- Makefile | 2 +- scipy-notebook/Dockerfile | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 960a1d63..d683bf3f 100644 --- a/Makefile +++ b/Makefile @@ -87,4 +87,4 @@ test/%: ## run tests against a stack @TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test test/base-notebook: ## test supported options in the base notebook - @TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test \ No newline at end of file + @TEST_IMAGE="$(OWNER)/$(notdir $@)" pytest test base-notebook/test diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 651a8b92..760b5584 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -15,8 +15,6 @@ RUN apt-get update && \ USER $NB_UID # Install Python 3 packages -# Remove pyqt and qt pulled in for matplotlib since we're only ever going to -# use notebook-friendly backends in these images RUN conda install --quiet --yes \ 'conda-forge::blas=*=openblas' \ 'ipywidgets=7.4*' \ @@ -43,7 +41,6 @@ RUN conda install --quiet --yes \ 'beautifulsoup4=4.7.*' \ 'protobuf=3.7.*' \ 'xlrd' && \ - conda remove --quiet --yes --force qt pyqt && \ conda clean --all -f -y && \ # Activate ipywidgets extension in the environment that runs the notebook server jupyter nbextension enable --py widgetsnbextension --sys-prefix && \