Pin Pillow because of a EasyOCR breakage (#1269) · szhorvat/docker-python@a581e74 · GitHub

szhorvat / docker-python Public

forked from Kaggle/docker-python

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit a581e74

Browse filesBrowse the repository at this point in the historyBrowse files

Philmod

authored

Pin Pillow because of a EasyOCR breakage (Kaggle#1269)

http://b/290035631

1 parent 15bd161 commit a581e74
Copy full SHA for a581e74

1 file changed

+10-8Lines changed: 10 additions & 8 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Dockerfile.tmpl

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Dockerfile.tmpl‎

Copy file name to clipboardExpand all lines: Dockerfile.tmpl

+10-8Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -96,7 +96,7 @@ RUN conda config --add channels nvidia && \
96	96	conda install -c conda-forge mamba && \
97	97	# Base image channel order: conda-forge (highest priority), defaults.
98	98	# End state: rapidsai (highest priority), nvidia, conda-forge, defaults.
99		- mamba install mkl cartopy imagemagick pyproj "shapely<2" && \
	99	+ mamba install -y mkl cartopy imagemagick pyproj "shapely<2" && \
100	100	/tmp/clean-layer.sh
101	101
102	102	{{ if eq .Accelerator "gpu" }}
@@ -109,17 +109,17 @@ RUN pip uninstall -y pyarrow && \
109	109
110	110	# Install implicit
111	111	{{ if eq .Accelerator "gpu" }}
112		- RUN mamba install implicit implicit-proc=*=gpu && \
	112	+ RUN mamba install -y implicit implicit-proc=*=gpu && \
113	113	/tmp/clean-layer.sh
114	114	{{ else }}
115		- RUN mamba install implicit && \
	115	+ RUN mamba install -y implicit && \
116	116	/tmp/clean-layer.sh
117	117	{{ end}}
118	118
119	119	# Install PyTorch
120	120	{{ if eq .Accelerator "gpu" }}
121	121	COPY --from=torch_whl /tmp/whl/*.whl /tmp/torch/
122		- RUN mamba install -c pytorch magma-cuda${CUDA_MAJOR_VERSION}${CUDA_MINOR_VERSION} && \
	122	+ RUN mamba install -y -c pytorch magma-cuda${CUDA_MAJOR_VERSION}${CUDA_MINOR_VERSION} && \
123	123	pip install /tmp/torch/*.whl && \
124	124	# b/255757999 openmp (libomp.so) is an dependency of libtorchtext and libtorchaudio but
125	125	mamba install -y openmp && \
@@ -161,7 +161,7 @@ RUN pip install jax[cpu] && \
161	161
162	162	# Install spacy
163	163	{{ if eq .Accelerator "gpu" }}
164		- RUN mamba install -c conda-forge spacy cupy && \
	164	+ RUN mamba install -y -c conda-forge spacy cupy && \
165	165	/tmp/clean-layer.sh
166	166	{{ else }}
167	167	RUN pip install spacy && \
@@ -386,8 +386,9 @@ RUN pip install annoy \
386	386	google-cloud-automl==1.0.1 \
387	387	google-api-core==1.33.2 \
388	388	google-cloud-bigquery \
389		- google-cloud-storage \
390		- google-cloud-translate==3.* \
	389	+ google-cloud-storage && \
	390	+ # Split these installations to avoid `pip._vendor.resolvelib.resolvers.ResolutionTooDeep: 200000`
	391	+ pip install google-cloud-translate==3.* \
391	392	google-cloud-language==2.* \
392	393	google-cloud-videointelligence==2.* \
393	394	google-cloud-vision==2.* \
@@ -447,7 +448,8 @@ RUN pip install bleach \
447	448	pandocfilters \
448	449	pexpect \
449	450	pickleshare \
450		- Pillow && \
	451	+ # TODO(b/290035631) unpin when EasyOCR did a release.
	452	+ Pillow==9.5.0 && \
451	453	# Install openslide and its python binding
452	454	apt-get install -y openslide-tools && \
453	455	pip install openslide-python \

0 commit comments

Comments

0 (0)