From 77b5555fee35c57843c6c53e8b5c843de9475f4d Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Fri, 31 May 2024 18:05:29 +0000 Subject: [PATCH 1/2] magic --- Dockerfile.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 3489e7c3..75a70716 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* && \ + pip install aiohttp && \ /tmp/clean-layer.sh # Download base easyocr models. From e629235d512016ba00fbd708173e91a7e1a8ba0d Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Mon, 3 Jun 2024 15:20:55 +0000 Subject: [PATCH 2/2] mamba --- Dockerfile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 75a70716..2b4cd33d 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -572,7 +572,7 @@ RUN pip install pytorch-ignite \ 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* && \ - pip install aiohttp && \ + mamba install --force-reinstall -y aiohttp && \ /tmp/clean-layer.sh # Download base easyocr models.