diff options
author | Adam Cozzette <acozzette@google.com> | 2018-06-25 13:22:10 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2018-06-25 13:22:10 -0700 |
commit | 82d3d7d250645322f8a7343188e5ae6246a76414 (patch) | |
tree | 34b7acb87b15c3b8395df3d311f2e795a1285d60 /python | |
parent | 35567c166842cca3ff6af3226ff526f25c79507f (diff) | |
parent | f7ada1280fac4af717d478e6a9765d3f02b418b3 (diff) | |
download | protobuf-82d3d7d250645322f8a7343188e5ae6246a76414.tar.gz protobuf-82d3d7d250645322f8a7343188e5ae6246a76414.tar.bz2 protobuf-82d3d7d250645322f8a7343188e5ae6246a76414.zip |
Merge branch '3.6.x' into merge-3-6-x
Diffstat (limited to 'python')
-rwxr-xr-x | python/google/protobuf/__init__.py | 2 | ||||
-rwxr-xr-x | python/setup.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index d4360727..58a3f040 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.2' +__version__ = '3.6.0' if __name__ != '__main__': try: diff --git a/python/setup.py b/python/setup.py index 1a282f99..6f8c83f0 100755 --- a/python/setup.py +++ b/python/setup.py @@ -204,11 +204,9 @@ if __name__ == '__main__': v, _, _ = platform.mac_ver() if v: - v = float('.'.join(v.split('.')[:2])) - if v >= 10.12: - extra_compile_args.append('-std=c++11') + extra_compile_args.append('-std=c++11') elif os.getenv('KOKORO_BUILD_NUMBER') or os.getenv('KOKORO_BUILD_ID'): - extra_compile_args.append('-std=c++11') + extra_compile_args.append('-std=c++11') if warnings_as_errors in sys.argv: extra_compile_args.append('-Werror') |