From 0c80ad20581a0c6c73b75f8d80365fd75d6d44ec Mon Sep 17 00:00:00 2001
From: Jiaxiao Zheng <jxzheng@google.com>
Date: Fri, 21 Feb 2020 11:00:12 -0800
Subject: [PATCH] release TFX from bypassing (#3146)

---
 .travis.yml                 | 13 ++++++-------
 backend/Dockerfile          |  2 +-
 test/sample-test/Dockerfile |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index acf0da5987a..a5acbf01f7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,13 +95,12 @@ matrix:
         - python3 -m pip install "${WHEEL_PATH}" --upgrade
         - set +e
         - set +x
-        # Two KFP-related unittests
-        # TODO(numerology) fix this after TFX dependency is fixed.
-#        - cd $TRAVIS_BUILD_DIR/tfx/tfx/orchestration/kubeflow
-#        - python3 kubeflow_dag_runner_test.py
-#        - cd $TRAVIS_BUILD_DIR/tfx/tfx/examples/chicago_taxi_pipeline
-#        - python3 taxi_pipeline_kubeflow_gcp_test.py
-#        - python3 taxi_pipeline_kubeflow_local_test.py
+        # Three KFP-related unittests
+        - cd $TRAVIS_BUILD_DIR/tfx/tfx/orchestration/kubeflow
+        - python3 kubeflow_dag_runner_test.py
+        - cd $TRAVIS_BUILD_DIR/tfx/tfx/examples/chicago_taxi_pipeline
+        - python3 taxi_pipeline_kubeflow_gcp_test.py
+        - python3 taxi_pipeline_kubeflow_local_test.py
 
         # Visualization test
         - cd $TRAVIS_BUILD_DIR/backend/src/apiserver/visualization
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 69c67f1ac93..743f6fa343d 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -28,7 +28,7 @@ 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.0 "tensorflow-data-validation<0.21.2"
+RUN python3 -m pip install tfx==0.21.0
 
 WORKDIR /go/src/github.com/kubeflow/pipelines
 COPY sdk sdk
diff --git a/test/sample-test/Dockerfile b/test/sample-test/Dockerfile
index f6cd4112b78..6d18303ce21 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.0 "tensorflow-data-validation<0.21.2"
+RUN pip3 install tfx==0.21.0
 
 # Install python client, including DSL compiler.
 COPY ./sdk/python /sdk/python