Skip to content

Commit 6ad0d7f

Browse files
committed
Fix pysal, shapely installs and bq test
http://b/289517451
1 parent fc49c3a commit 6ad0d7f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Dockerfile.tmpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ RUN conda config --add channels nvidia && \
9696
conda install -c conda-forge mamba && \
9797
# Base image channel order: conda-forge (highest priority), defaults.
9898
# End state: rapidsai (highest priority), nvidia, conda-forge, defaults.
99-
mamba install mkl cartopy imagemagick pyproj && \
99+
mamba install mkl cartopy imagemagick pyproj "shapely<2" && \
100100
/tmp/clean-layer.sh
101101

102102
{{ if eq .Accelerator "gpu" }}
@@ -197,6 +197,8 @@ RUN JAXVER=$(pip freeze | grep -e "^jax==") && \
197197
tensorflow_text && \
198198
/tmp/clean-layer.sh
199199

200+
RUN pip install pysal
201+
200202
RUN apt-get install -y libfreetype6-dev && \
201203
apt-get install -y libglib2.0-0 libxext6 libsm6 libxrender1 libfontconfig1 --fix-missing && \
202204
pip install gensim \
@@ -270,6 +272,8 @@ RUN apt-get install -y libgl1-mesa-glx && \
270272
pip install xvfbwrapper && \
271273
/tmp/clean-layer.sh
272274

275+
RUN rm -rf /opt/conda/lib/python3.10/site-packages/Shapely-1.8.5.post1.dist-info/
276+
273277
RUN pip install mpld3 \
274278
gpxpy \
275279
arrow \

tests/test_bigquery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def test_no_project_with_connected_account(self):
126126
env.set('KAGGLE_USER_SECRETS_TOKEN', 'foobar')
127127
env.set('KAGGLE_KERNEL_INTEGRATIONS', 'BIGQUERY')
128128
with env:
129-
with self.assertRaises(DefaultCredentialsError):
129+
with self.assertRaises(OSError):
130130
# TODO(vimota): Handle this case, either default to Kaggle Proxy or use some default project
131131
# by the user or throw a custom exception.
132132
client = bigquery.Client(client_options={"api_endpoint": TestBigQuery.API_BASE_URL})

0 commit comments

Comments
 (0)