From 19bf53c25a10edbb862680e9c13ad07c3edb7483 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Thu, 1 Mar 2018 15:07:12 -0800 Subject: Change version of wheel --- .travis.yml | 1 + appveyor.bat | 4 +++- appveyor.yml | 1 + config.sh | 13 +++++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4cb72e0d..dbfbf3f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ env: global: - REPO_DIR=protobuf - BUILD_COMMIT=v3.5.1 + - BUILD_VERSION=3.5.1.dev1 - PLAT=x86_64 - UNICODE_WIDTH=32 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker diff --git a/appveyor.bat b/appveyor.bat index bf4ec2a6..e22ab434 100644 --- a/appveyor.bat +++ b/appveyor.bat @@ -45,6 +45,9 @@ REM ====================== cd python +REM Modify Build Version +sed -i '/__version__/c\__version__ = \'%BUILD_VERSION%\'' google/protobuf/__init__.py + REM https://github.com/Theano/Theano/issues/4926 sed -i '/Wno-sign-compare/a \ \ \ \ extra_compile_args.append(\'-D_hypot=hypot\')' setup.py sed -i 's/\'-DPYTHON_PROTO2_CPP_IMPL_V2\'/\'-DPYTHON_PROTO2_CPP_IMPL_V2\',\'-D_hypot=hypot\'/g' setup.py @@ -68,6 +71,5 @@ sed -i '/-Wno-invalid-offsetof/d' setup.py sed -i '/-Wno-sign-compare/d' setup.py :msvc_remove_flags_end -cat setup.py python setup.py bdist_wheel --cpp_implementation --compile_static_extension cd ..\.. diff --git a/appveyor.yml b/appveyor.yml index 3c618937..6d1be235 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,7 @@ environment: REPO_DIR: protobuf PACKAGE_NAME: protobuf BUILD_COMMIT: v3.5.1 + BUILD_VERSION: 3.5.1.dev1 MINGW_32: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin MINGW_64: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin BUILD_DLL: OFF diff --git a/config.sh b/config.sh index b628e364..3438ba44 100644 --- a/config.sh +++ b/config.sh @@ -29,6 +29,19 @@ function bdist_wheel_cmd { # fixed with bdist_wheel: # https://github.com/warner/python-versioneer/issues/121 local abs_wheelhouse=$1 + + # Modify build version + pwd + ls + echo $abs_wheelhouse + echo $BUILD_VERSION + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + sed -i.bu "s/^__version__.*/__version__ = '$BUILD_VERSION'/" google/protobuf/__init__.py + else + sed -i "s/^__version__.*/__version__ = '3.5.1.dev1'/" google/protobuf/__init__.py + fi + cat google/protobuf/__init__.py + python setup.py bdist_wheel --cpp_implementation --compile_static_extension cp dist/*.whl $abs_wheelhouse } -- cgit v1.2.3