From a4747774836607dfea3216ca56985773b029cc30 Mon Sep 17 00:00:00 2001 From: Jiaxiao Zheng Date: Wed, 12 Feb 2020 21:42:35 -0800 Subject: [PATCH] [Fix] Pin avro==1.9.1 (#3067) * pin * pin * remove * pin in docker * correct name * add license (why) * revert avro * Update backend/src/apiserver/visualization/third_party_licenses.csv * Pin avro 1.9.1 for backend dockerfile * pin in sample test image * Update Dockerfile * fix typo Co-authored-by: Yuan (Bob) Gong --- backend/Dockerfile | 3 ++- backend/src/apiserver/visualization/requirements.txt | 1 + backend/src/apiserver/visualization/third_party_licenses.csv | 1 + test/sample-test/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 8ba646ee339b..3b98a1fe9e6e 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -28,7 +28,8 @@ FROM python:3.5 as compiler RUN apt-get update -y && \ apt-get install --no-install-recommends -y -q default-jdk python3-setuptools python3-dev RUN wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py -RUN python3 -m pip install tfx==0.21.0rc0 +# pin avro==1.9.1 because installing just tfx brings avro 1.9.2, which breaks the build +RUN python3 -m pip install avro-python3==1.9.1 tfx==0.21.0rc0 WORKDIR /go/src/github.com/kubeflow/pipelines COPY sdk sdk diff --git a/backend/src/apiserver/visualization/requirements.txt b/backend/src/apiserver/visualization/requirements.txt index 0029af08546a..b81a5dbcd1da 100644 --- a/backend/src/apiserver/visualization/requirements.txt +++ b/backend/src/apiserver/visualization/requirements.txt @@ -1,3 +1,4 @@ +avro-python3==1.9.1 bokeh==1.2.0 gcsfs==0.2.3 google-api-python-client==1.7.9 diff --git a/backend/src/apiserver/visualization/third_party_licenses.csv b/backend/src/apiserver/visualization/third_party_licenses.csv index 7617ea02cad5..1b26577d79e0 100644 --- a/backend/src/apiserver/visualization/third_party_licenses.csv +++ b/backend/src/apiserver/visualization/third_party_licenses.csv @@ -12,6 +12,7 @@ absl-py,https://github.com/abseil/abseil-py/blob/master/LICENSE,Apache 2.0 apache-beam,https://github.com/apache/beam/blob/master/LICENSE,Apache 2.0 astor,https://github.com/berkerpeksag/astor/blob/master/LICENSE,BSD-3 attrs,https://github.com/python-attrs/attrs/blob/master/LICENSE,MIT +avro,https://github.com/apache/avro/blob/master/LICENSE.txt,Apache 2.0 avro-python3,https://github.com/apache/avro/blob/master/LICENSE.txt,Apache 2.0 backcall,https://github.com/takluyver/backcall/blob/master/LICENSE,BSD-3 bleach,https://github.com/mozilla/bleach/blob/master/LICENSE,Apache 2.0 diff --git a/test/sample-test/Dockerfile b/test/sample-test/Dockerfile index e6b1bd7e673d..e2f9f8ed52fc 100644 --- a/test/sample-test/Dockerfile +++ b/test/sample-test/Dockerfile @@ -19,7 +19,7 @@ RUN pip3 install google-api-python-client==1.7.0 RUN pip3 install google-cloud-storage==1.17.0 RUN pip3 install fire==0.2.1 RUN pip3 install yamale==2.0 -RUN pip3 install tfx==0.21.0rc0 +RUN pip3 install tfx==0.21.0rc0 avro-python3==1.9.1 # Install python client, including DSL compiler. COPY ./sdk/python /sdk/python