diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
| commit | 383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a (patch) | |
| tree | 45bdce007f64e47ff2a0b60fb1920efc3eaf3b00 /python | |
| parent | 8529f2aee33ae793c9ce362a45370b98f675370a (diff) | |
| parent | 88e5573b9a8a5c4038f9db3633610f032aab277d (diff) | |
| download | protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.tar.gz protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.tar.bz2 protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.zip | |
Merge remote-tracking branch 'origin/3.5.x' into master
Diffstat (limited to 'python')
| -rwxr-xr-x | python/google/protobuf/__init__.py | 2 | ||||
| -rwxr-xr-x | python/release.sh | 3 | ||||
| -rwxr-xr-x | python/setup.py | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 0f4d63b0..950f9b2d 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,7 +30,7 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.5.0.post1' +__version__ = '3.5.1' if __name__ != '__main__': try: diff --git a/python/release.sh b/python/release.sh index 01fc5e23..a71cc7f5 100755 --- a/python/release.sh +++ b/python/release.sh @@ -19,7 +19,7 @@ function run_install_test() { chmod +x test-venv/bin/protoc source test-venv/bin/activate - pip install -i ${PYPI} protobuf==${VERSION} + pip install -i ${PYPI} protobuf==${VERSION} --no-cache-dir deactivate rm -fr test-venv } @@ -88,6 +88,7 @@ run_install_test ${TESTING_VERSION} python3.4 https://test.pypi.org/simple # Deploy egg/wheel packages to testing PyPI and test again. python setup.py bdist_egg bdist_wheel upload -r https://test.pypi.org/legacy/ + run_install_test ${TESTING_VERSION} python2.7 https://test.pypi.org/simple run_install_test ${TESTING_VERSION} python3.4 https://test.pypi.org/simple diff --git a/python/setup.py b/python/setup.py index efb74fe7..0f7e58b0 100755 --- a/python/setup.py +++ b/python/setup.py @@ -240,7 +240,6 @@ if __name__ == '__main__': classifiers=[ "Programming Language :: Python", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", |