Merge branch 'master' into conda_outdated

This commit is contained in:
Romain
2020-02-29 08:21:52 +01:00
committed by GitHub

View File

@@ -19,9 +19,9 @@ RUN conda install --quiet --yes \
'beautifulsoup4=4.8.*' \ 'beautifulsoup4=4.8.*' \
'conda-forge::blas=*=openblas' \ 'conda-forge::blas=*=openblas' \
'bokeh=1.4.*' \ 'bokeh=1.4.*' \
'cloudpickle=1.2.*' \ 'cloudpickle=1.3.*' \
'cython=0.29.*' \ 'cython=0.29.*' \
'dask=2.9.*' \ 'dask=2.11.*' \
'dill=0.3.*' \ 'dill=0.3.*' \
'h5py=2.10.*' \ 'h5py=2.10.*' \
'hdf5=1.10.*' \ 'hdf5=1.10.*' \
@@ -29,13 +29,13 @@ RUN conda install --quiet --yes \
'matplotlib-base=3.1.*' \ 'matplotlib-base=3.1.*' \
'numba=0.48.*' \ 'numba=0.48.*' \
'numexpr=2.7.*' \ 'numexpr=2.7.*' \
'pandas=0.25.*' \ 'pandas=1.0.*' \
'patsy=0.5.*' \ 'patsy=0.5.*' \
'protobuf=3.11.*' \ 'protobuf=3.11.*' \
'scikit-image=0.16.*' \ 'scikit-image=0.16.*' \
'scikit-learn=0.22.*' \ 'scikit-learn=0.22.*' \
'scipy=1.4.*' \ 'scipy=1.4.*' \
'seaborn=0.9.*' \ 'seaborn=0.10.*' \
'sqlalchemy=1.3.*' \ 'sqlalchemy=1.3.*' \
'statsmodels=0.11.*' \ 'statsmodels=0.11.*' \
'sympy=1.5.*' \ 'sympy=1.5.*' \