From f66b9fda721008f06eb0739eba1491220136647f Mon Sep 17 00:00:00 2001 From: gvasudevan Date: Tue, 14 Aug 2018 14:53:44 -0700 Subject: [PATCH] Keep pypi package from overwriting TF package PiperOrigin-RevId: 208718607 (cherry picked from commit fc8c5301125903a3e2ddc8b743f78f0d539bf61b) --- tensorflow_serving/tools/pip_package/build_pip_package.sh | 8 -------- tensorflow_serving/tools/pip_package/setup.py | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tensorflow_serving/tools/pip_package/build_pip_package.sh b/tensorflow_serving/tools/pip_package/build_pip_package.sh index 2833fc64613..2fba7336489 100755 --- a/tensorflow_serving/tools/pip_package/build_pip_package.sh +++ b/tensorflow_serving/tools/pip_package/build_pip_package.sh @@ -37,7 +37,6 @@ function main() { mkdir -p ${TMPDIR}/tensorflow_serving/config mkdir -p ${TMPDIR}/tensorflow_serving/sources/storage_path mkdir -p ${TMPDIR}/tensorflow_serving/util - mkdir -p ${TMPDIR}/tensorflow/core/lib/core echo "Adding python files" cp bazel-genfiles/tensorflow_serving/apis/*_pb2.py \ @@ -58,19 +57,12 @@ function main() { cp bazel-genfiles/tensorflow_serving/util/*_pb2.py \ "${TMPDIR}/tensorflow_serving/util" - cp bazel-genfiles/external/org_tensorflow/tensorflow/core/lib/core/*.py \ - "${TMPDIR}/tensorflow/core/lib/core" - touch "${TMPDIR}/tensorflow_serving/apis/__init__.py" touch "${TMPDIR}/tensorflow_serving/config/__init__.py" touch "${TMPDIR}/tensorflow_serving/sources/__init__.py" touch "${TMPDIR}/tensorflow_serving/sources/storage_path/__init__.py" touch "${TMPDIR}/tensorflow_serving/util/__init__.py" touch "${TMPDIR}/tensorflow_serving/__init__.py" - touch "${TMPDIR}/tensorflow/__init__.py" - touch "${TMPDIR}/tensorflow/core/__init__.py" - touch "${TMPDIR}/tensorflow/core/lib/__init__.py" - touch "${TMPDIR}/tensorflow/core/lib/core/__init__.py" echo "Adding package setup files" cp ${PIP_SRC_DIR}/setup.py "${TMPDIR}" diff --git a/tensorflow_serving/tools/pip_package/setup.py b/tensorflow_serving/tools/pip_package/setup.py index 0f310579cfe..ec41877b3b5 100644 --- a/tensorflow_serving/tools/pip_package/setup.py +++ b/tensorflow_serving/tools/pip_package/setup.py @@ -34,7 +34,7 @@ REQUIRED_PACKAGES = [ 'tensorflow>=1.2.0,<2', 'grpcio>=1.0<2', - 'protobuf==3.6.0', + 'protobuf>=3.6.0', ] setup(