Commit 3ef53ce4 authored by Peter Parente's avatar Peter Parente Committed by GitHub

Merge branch 'master' into github-actions

parents 5758b593 1a66dd36
...@@ -25,8 +25,6 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \ ...@@ -25,8 +25,6 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
texlive-xetex \ texlive-xetex \
texlive-fonts-recommended \ texlive-fonts-recommended \
texlive-plain-generic \ texlive-plain-generic \
# Optional dependency
texlive-fonts-extra \
# ---- # ----
tzdata \ tzdata \
unzip \ unzip \
......
...@@ -18,11 +18,11 @@ USER $NB_UID ...@@ -18,11 +18,11 @@ USER $NB_UID
RUN conda install --quiet --yes \ RUN conda install --quiet --yes \
'beautifulsoup4=4.9.*' \ 'beautifulsoup4=4.9.*' \
'conda-forge::blas=*=openblas' \ 'conda-forge::blas=*=openblas' \
'bokeh=2.0.*' \ 'bokeh=2.1.*' \
'bottleneck=1.3.*' \ 'bottleneck=1.3.*' \
'cloudpickle=1.4.*' \ 'cloudpickle=1.5.*' \
'cython=0.29.*' \ 'cython=0.29.*' \
'dask=2.15.*' \ 'dask=2.20.*' \
'dill=0.3.*' \ 'dill=0.3.*' \
'h5py=2.10.*' \ 'h5py=2.10.*' \
'hdf5=1.10.*' \ 'hdf5=1.10.*' \
...@@ -34,15 +34,15 @@ RUN conda install --quiet --yes \ ...@@ -34,15 +34,15 @@ RUN conda install --quiet --yes \
'numexpr=2.7.*' \ 'numexpr=2.7.*' \
'pandas=1.0.*' \ 'pandas=1.0.*' \
'patsy=0.5.*' \ 'patsy=0.5.*' \
'protobuf=3.11.*' \ 'protobuf=3.12.*' \
'pytables=3.6.*' \ 'pytables=3.6.*' \
'scikit-image=0.16.*' \ 'scikit-image=0.17.*' \
'scikit-learn=0.23.*' \ 'scikit-learn=0.23.*' \
'scipy=1.4.*' \ 'scipy=1.5.*' \
'seaborn=0.10.*' \ 'seaborn=0.10.*' \
'sqlalchemy=1.3.*' \ 'sqlalchemy=1.3.*' \
'statsmodels=0.11.*' \ 'statsmodels=0.11.*' \
'sympy=1.5.*' \ 'sympy=1.6.*' \
'vincent=0.4.*' \ 'vincent=0.4.*' \
'widgetsnbextension=3.5.*'\ 'widgetsnbextension=3.5.*'\
'xlrd=1.2.*' \ 'xlrd=1.2.*' \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment