Commit 6213dce
authored
Merge pull request Kaggle#352 from Kaggle/bump-anaconda-base
Upgrade anaconda base to 5.2.01 file changed
Lines changed: 6 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | FROM gcr.io/kaggle-images/python-tensorflow-whl:1.11.0-py36 as tensorflow_whl | |
| 2 | - FROM continuumio/anaconda3:5.0.1 | ||
| 2 | + FROM continuumio/anaconda3:5.2.0 | ||
| 3 | 3 | ||
| 4 | 4 | # This is necessary for apt to access HTTPS sources | |
| 5 | 5 | RUN apt-get update && \ | |
@@ -30,13 +30,13 @@ RUN pip install seaborn python-dateutil dask pytagcloud pyyaml joblib \ | |||
| 30 | 30 | conda install -y -c conda-forge spacy && python -m spacy download en && \ | |
| 31 | 31 | python -m spacy download en_core_web_lg && \ | |
| 32 | 32 | # The apt-get version of imagemagick is out of date and has compatibility issues, so we build from source | |
| 33 | - apt-get -y install dbus fontconfig fontconfig-config fonts-dejavu-core fonts-droid ghostscript gsfonts hicolor-icon-theme \ | ||
| 33 | + apt-get -y install dbus fontconfig fontconfig-config fonts-dejavu-core fonts-droid-fallback ghostscript gsfonts hicolor-icon-theme \ | ||
| 34 | 34 | libavahi-client3 libavahi-common-data libavahi-common3 libcairo2 libcap-ng0 libcroco3 \ | |
| 35 | 35 | libcups2 libcupsfilters1 libcupsimage2 libdatrie1 libdbus-1-3 libdjvulibre-text libdjvulibre21 libfftw3-double3 libfontconfig1 \ | |
| 36 | 36 | libfreetype6 libgdk-pixbuf2.0-0 libgdk-pixbuf2.0-common libgomp1 libgraphite2-3 libgs9 libgs9-common libharfbuzz0b libijs-0.35 \ | |
| 37 | - libilmbase6 libjasper1 libjbig0 libjbig2dec0 libjpeg62-turbo liblcms2-2 liblqr-1-0 libltdl7 libmagickcore-6.q16-2 \ | ||
| 38 | - libmagickcore-6.q16-2-extra libmagickwand-6.q16-2 libnetpbm10 libopenexr6 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 \ | ||
| 39 | - libpaper-utils libpaper1 libpixman-1-0 libpng12-0 librsvg2-2 librsvg2-common libthai-data libthai0 libtiff5 libwmf0.2-7 \ | ||
| 37 | + libilmbase12 libjbig0 libjbig2dec0 libjpeg62-turbo liblcms2-2 liblqr-1-0 libltdl7 libmagickcore-6.q16-3 \ | ||
| 38 | + libmagickcore-6.q16-3-extra libmagickwand-6.q16-3 libnetpbm10 libopenexr22 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 \ | ||
| 39 | + libpaper-utils libpaper1 libpixman-1-0 libpng16-16 librsvg2-2 librsvg2-common libthai-data libthai0 libtiff5 libwmf0.2-7 \ | ||
| 40 | 40 | libxcb-render0 libxcb-shm0 netpbm poppler-data p7zip-full && \ | |
| 41 | 41 | cd /usr/local/src && \ | |
| 42 | 42 | wget http://transloadit.imagemagick.org/download/ImageMagick.tar.gz && \ | |
@@ -126,13 +126,7 @@ RUN apt-get -y install zlib1g-dev liblcms2-dev libwebp-dev libgeos-dev && \ | |||
| 126 | 126 | cd /usr/local/src && git clone https://github.com/matplotlib/basemap.git && \ | |
| 127 | 127 | cd basemap && \ | |
| 128 | 128 | git checkout v1.1.0 && \ | |
| 129 | - # Install geos | ||
| 130 | - cd geos-3.3.3 && \ | ||
| 131 | - export GEOS_DIR=/usr/local && \ | ||
| 132 | - ./configure --prefix=$GEOS_DIR && \ | ||
| 133 | - make && make install && \ | ||
| 134 | - # Install basemap | ||
| 135 | - cd .. && python setup.py install && \ | ||
| 129 | + python setup.py install && \ | ||
| 136 | 130 | pip install basemap --no-binary basemap | |
| 137 | 131 | ||
| 138 | 132 | # sasl is apparently an ibis dependency | |
0 commit comments