aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rwxr-xr-xpython/google/protobuf/__init__.py2
-rwxr-xr-xpython/release.sh3
-rwxr-xr-xpython/release/wheel/protobuf_optimized_pip.sh9
-rwxr-xr-xpython/setup.py1
4 files changed, 6 insertions, 9 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/release/wheel/protobuf_optimized_pip.sh b/python/release/wheel/protobuf_optimized_pip.sh
index 064d1d2a..98306f4c 100755
--- a/python/release/wheel/protobuf_optimized_pip.sh
+++ b/python/release/wheel/protobuf_optimized_pip.sh
@@ -6,7 +6,7 @@ set -ex
# Print usage and fail.
function usage() {
- echo "Usage: protobuf_optimized_pip.sh PROTOBUF_VERSION PYPI_USERNAME PYPI_PASSWORD" >&2
+ echo "Usage: protobuf_optimized_pip.sh PROTOBUF_VERSION" >&2
exit 1 # Causes caller to exit because we use -e.
}
@@ -25,7 +25,7 @@ if [ $0 != ./protobuf_optimized_pip.sh ]; then
exit 1
fi
-if [ $# -lt 3 ]; then
+if [ $# -lt 1 ]; then
usage
exit 1
fi
@@ -63,7 +63,4 @@ do
build_wheel $PYTHON_VERSION
done
-/opt/python/cp27-cp27mu/bin/twine upload wheelhouse/* <<!
-$PYPI_USERNAME
-$PYPI_PASSWORD
-!
+/opt/python/cp27-cp27mu/bin/twine upload wheelhouse/*
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",