Merge branch 'master' into github-actions

jupyter · Aug 1, 2020 · 3ef53ce · 3ef53ce
2 parents 5758b59 + 1a66dd3
commit 3ef53ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile
@@ -25,8 +25,6 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
     texlive-xetex \
     texlive-fonts-recommended \
     texlive-plain-generic \
-    # Optional dependency
-    texlive-fonts-extra \
     # ----
     tzdata \
     unzip \

diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile
@@ -18,11 +18,11 @@ USER $NB_UID
 RUN conda install --quiet --yes \
     'beautifulsoup4=4.9.*' \
     'conda-forge::blas=*=openblas' \
-    'bokeh=2.0.*' \
+    'bokeh=2.1.*' \
     'bottleneck=1.3.*' \
-    'cloudpickle=1.4.*' \
+    'cloudpickle=1.5.*' \
     'cython=0.29.*' \
-    'dask=2.15.*' \
+    'dask=2.20.*' \
     'dill=0.3.*' \
     'h5py=2.10.*' \
     'hdf5=1.10.*' \
@@ -34,15 +34,15 @@ RUN conda install --quiet --yes \
     'numexpr=2.7.*' \
     'pandas=1.0.*' \
     'patsy=0.5.*' \
-    'protobuf=3.11.*' \
+    'protobuf=3.12.*' \
     'pytables=3.6.*' \
-    'scikit-image=0.16.*' \
+    'scikit-image=0.17.*' \
     'scikit-learn=0.23.*' \
-    'scipy=1.4.*' \
+    'scipy=1.5.*' \
     'seaborn=0.10.*' \
     'sqlalchemy=1.3.*' \
     'statsmodels=0.11.*' \
-    'sympy=1.5.*' \
+    'sympy=1.6.*' \
     'vincent=0.4.*' \
     'widgetsnbextension=3.5.*'\
     'xlrd=1.2.*' \