Skip to content

Commit b33cb0e

Browse files
committed
fix cpu tests
1 parent 52c194b commit b33cb0e

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Dockerfile.tmpl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -381,16 +381,6 @@ RUN pip install tensorpack && \
381381
# Remove files that can't be uninstalled normally:
382382
RUN rm /opt/conda/lib/python3.7/site-packages/google*/REQUESTED
383383
RUN rm /opt/conda/lib/python3.7/site-packages/google*/direct_url.json
384-
# google-cloud-automl 2.0.0 introduced incompatible API changes, need to pin to 1.0.1
385-
RUN pip install google-cloud-automl==1.0.1 \
386-
google-api-core==1.33.2 \
387-
google-cloud-bigquery==2.2.0 \
388-
google-cloud-storage \
389-
google-cloud-translate==3.* \
390-
google-cloud-language==2.* \
391-
google-cloud-videointelligence==2.* \
392-
google-cloud-vision==2.* \
393-
protobuf==3.20.3
394384
# install cython & cysignals before pyfasttext
395385
RUN pip install cython \
396386
cysignals \
@@ -401,8 +391,18 @@ RUN pip install annoy \
401391
category_encoders && \
402392
# b/183041606#comment5: the Kaggle data proxy doesn't support these APIs. If the library is missing, it falls back to using a regular BigQuery query to fetch data.
403393
pip uninstall -y google-cloud-bigquery-storage && \
394+
# google-cloud-automl 2.0.0 introduced incompatible API changes, need to pin to 1.0.1
404395
# After launch this should be installed from pip
405396
pip install git+https://github.com/googleapis/python-aiplatform.git@mb-release \
397+
google-cloud-automl==1.0.1 \
398+
google-api-core==1.33.2 \
399+
google-cloud-bigquery==2.2.0 \
400+
google-cloud-storage \
401+
google-cloud-translate==3.* \
402+
google-cloud-language==2.* \
403+
google-cloud-videointelligence==2.* \
404+
google-cloud-vision==2.* \
405+
protobuf==3.20.3 \
406406
ortools \
407407
scattertext \
408408
# Pandas data reader
@@ -502,7 +502,7 @@ RUN pip install flashtext \
502502
pympler \
503503
s3fs \
504504
featuretools \
505-
-e git+https://github.com/SohierDane/BigQuery_Helper#egg=bq_helper \
505+
#-e git+https://github.com/SohierDane/BigQuery_Helper#egg=bq_helper \
506506
hpsklearn \
507507
git+https://github.com/Kaggle/learntools \
508508
kmapper \
@@ -529,8 +529,8 @@ RUN pip install flashtext \
529529
catalyst \
530530
# b/206990323 osmx 1.1.2 requires numpy >= 1.21 which we don't want.
531531
osmnx==1.1.1 && \
532-
apt-get -y install libspatialindex-dev && \
533-
pip install pytorch-ignite \
532+
apt-get -y install libspatialindex-dev
533+
RUN pip install pytorch-ignite \
534534
qgrid \
535535
bqplot \
536536
earthengine-api \
@@ -549,9 +549,7 @@ RUN pip install flashtext \
549549
# flask is used by agents in the simulation competitions.
550550
flask \
551551
# pycrypto is used by competitions team.
552-
pycrypto \
553-
# https://github.com/pycrypto/pycrypto/issues/327
554-
'setuptools<58' \
552+
pycryptodome \
555553
easyocr \
556554
# ipympl adds interactive widget support for matplotlib
557555
ipympl==0.7.0 \
@@ -606,6 +604,8 @@ RUN pip install --upgrade dask && \
606604
ln -sf /usr/lib/x86_64-linux-gnu/libpixman-1.so.0.34.0 /opt/conda/lib/libpixman-1.so.0.38.0 && \
607605
/tmp/clean-layer.sh
608606

607+
RUN pip install setuptools==59.8.0 && pip install -e git+https://github.com/SohierDane/BigQuery_Helper#egg=bq_helper
608+
609609
# Add BigQuery client proxy settings
610610
ENV PYTHONUSERBASE "/root/.local"
611611
ADD patches/kaggle_gcp.py /root/.local/lib/python3.7/site-packages/kaggle_gcp.py

0 commit comments

Comments
 (0)