Merge remote-tracking branch 'upstream/master' into ZEPPELIN-2813

This commit is contained in:
tinkoff-dwh 2017-11-01 11:34:41 +03:00
commit acc624f102

View file

@ -44,6 +44,6 @@ if [[ -n "$PYTHON" ]] ; then
conda update -q conda
conda info -a
conda config --add channels conda-forge
conda install -q matplotlib pandasql ipython jupyter_client ipykernel matplotlib bokeh
conda install -q matplotlib pandasql ipython jupyter_client ipykernel matplotlib bokeh=0.12.6
pip install -q grpcio ggplot
fi