diff options
-rwxr-xr-x | python/release.sh | 3 | ||||
-rwxr-xr-x | python/release/wheel/protobuf_optimized_pip.sh | 9 | ||||
-rw-r--r-- | src/google/protobuf/stubs/io_win32.cc | 2 |
3 files changed, 6 insertions, 8 deletions
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/src/google/protobuf/stubs/io_win32.cc b/src/google/protobuf/stubs/io_win32.cc index ad2d2d26..b59b8e48 100644 --- a/src/google/protobuf/stubs/io_win32.cc +++ b/src/google/protobuf/stubs/io_win32.cc @@ -91,7 +91,7 @@ struct CharTraits<wchar_t> { template <typename char_type> bool null_or_empty(const char_type* s) { - return s == nullptr || *s == 0; + return s == NULL || *s == 0; } // Returns true if the path starts with a drive letter, e.g. "c:". |