experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update all protobuf versions

Browse Source
This commit is contained in:
Jonathan Hseu 2017-06-15 12:01:19 -07:00 committed by Martin Wicke
parent 147dc8dc7e
commit d603a253d5
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/java/maven/proto/pom.xml
View File

@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>3.2.0</version> <version>3.3.1</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
tensorflow/java/maven/run_inside_container.sh
View File

@ -23,7 +23,7 @@ IS_SNAPSHOT="false"
if [[ "${TF_VERSION}" == *"-SNAPSHOT" ]]; then if [[ "${TF_VERSION}" == *"-SNAPSHOT" ]]; then
IS_SNAPSHOT="true" IS_SNAPSHOT="true"
fi fi
PROTOC_RELEASE_URL="https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip" PROTOC_RELEASE_URL="https://github.com/google/protobuf/releases/download/v3.3.1/protoc-3.3.1-linux-x86_64.zip"
set -ex set -ex

4
tensorflow/tools/ci_build/install/install_pip_packages.sh
View File

@ -44,8 +44,8 @@ pip2 install --upgrade markdown==2.6.8
pip3 install --upgrade markdown==2.6.8 pip3 install --upgrade markdown==2.6.8
# Install protobuf. # Install protobuf.
pip2 install --upgrade protobuf==3.2.0 pip2 install --upgrade protobuf==3.3.0
pip3 install --upgrade protobuf==3.2.0 pip3 install --upgrade protobuf==3.3.0
# Remove obsolete version of six, which can sometimes confuse virtualenv. # Remove obsolete version of six, which can sometimes confuse virtualenv.
rm -rf /usr/lib/python3/dist-packages/six* rm -rf /usr/lib/python3/dist-packages/six*

2
tensorflow/tools/ci_build/install/install_proto3.sh
View File

@ -17,7 +17,7 @@
# Install protobuf3. # Install protobuf3.
# Select protobuf version. # Select protobuf version.
PROTOBUF_VERSION="3.2.0" PROTOBUF_VERSION="3.3.1"
protobuf_ver_flat=$(echo $PROTOBUF_VERSION | sed 's/\.//g' | sed 's/^0*//g') protobuf_ver_flat=$(echo $PROTOBUF_VERSION | sed 's/\.//g' | sed 's/^0*//g')
local_protobuf_ver=$(protoc --version | awk '{print $2}') local_protobuf_ver=$(protoc --version | awk '{print $2}')
local_protobuf_ver_flat=$(echo $local_protobuf_ver | sed 's/\.//g' | sed 's/^0*//g') local_protobuf_ver_flat=$(echo $local_protobuf_ver | sed 's/\.//g' | sed 's/^0*//g')

2
tensorflow/tools/ci_build/install/install_python3.5_pip_packages.sh
View File

@ -64,7 +64,7 @@ set -e
pip3.5 install --upgrade six==1.10.0 pip3.5 install --upgrade six==1.10.0
# Install protobuf. # Install protobuf.
pip3.5 install --upgrade protobuf==3.2.0 pip3.5 install --upgrade protobuf==3.3.0
# Remove obsolete version of six, which can sometimes confuse virtualenv. # Remove obsolete version of six, which can sometimes confuse virtualenv.
rm -rf /usr/lib/python3/dist-packages/six* rm -rf /usr/lib/python3/dist-packages/six*

2
tensorflow/tools/ci_build/protobuf/protobuf_optimized_pip.sh
View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# ============================================================================== # ==============================================================================
PROTOBUF_VERSION="3.2.0" PROTOBUF_VERSION="3.3.1"
PYTHON_BIN=${PYTHON_BIN:-python} PYTHON_BIN=${PYTHON_BIN:-python}
DIR=${PWD}/protobuf DIR=${PWD}/protobuf

2
tensorflow/tools/pip_package/setup.py
View File

@ -34,7 +34,7 @@ _VERSION = '1.2.0-rc2'
REQUIRED_PACKAGES = [ REQUIRED_PACKAGES = [
'numpy >= 1.11.0', 'numpy >= 1.11.0',
'six >= 1.10.0', 'six >= 1.10.0',
'protobuf >= 3.2.0', 'protobuf >= 3.3.0',
'werkzeug >= 0.11.10', 'werkzeug >= 0.11.10',
'html5lib == 0.9999999', # identical to 1.0b8 'html5lib == 0.9999999', # identical to 1.0b8
'markdown == 2.2.0', 'markdown == 2.2.0',