diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 3489e7c3..2b4cd33d 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -424,10 +424,7 @@ RUN pip install annoy \ # b/273059949 The pre-installed nbconvert is slow on html conversions and has to be force-uninstalled. # b/274619697 learntools also requires a specific nbconvert right now -RUN rm -rf /opt/conda/lib/python3.10/site-packages/nbconvert* -RUN rm -rf /opt/conda/lib/python3.10/site-packages/nbclient* -RUN rm -rf /opt/conda/lib/python3.10/site-packages/mistune* -RUN rm -rf /opt/conda/lib/python3.10/site-packages/platformdirs* +RUN rm -rf /opt/conda/lib/python3.10/site-packages/{nbconvert,nbclient,mistune,platformdirs}* # Fix qgrid by pinning ipywidgets https://github.com/quantopian/qgrid/issues/376 # allennlp \ @@ -573,6 +570,9 @@ RUN pip install pytorch-ignite \ timm \ torchinfo && \ pip install git+https://github.com/facebookresearch/segment-anything.git && \ + # b/343971718: remove duplicate aiohttp installs, and reinstall it + rm -rf /opt/conda/lib/python3.10/site-packages/aiohttp* && \ + mamba install --force-reinstall -y aiohttp && \ /tmp/clean-layer.sh # Download base easyocr models.