diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-06-25 15:52:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 15:52:29 -0700 |
| commit | d6f346b4d55ae5112934297593ec1c56c3d178a5 (patch) | |
| tree | 021b5476160e465a20ef7d4ae4c0524351667233 /python | |
| parent | 3d603f481ed142d0be5e8e4dd6d1cb4457a51405 (diff) | |
| parent | 82d3d7d250645322f8a7343188e5ae6246a76414 (diff) | |
| download | protobuf-d6f346b4d55ae5112934297593ec1c56c3d178a5.tar.gz protobuf-d6f346b4d55ae5112934297593ec1c56c3d178a5.tar.bz2 protobuf-d6f346b4d55ae5112934297593ec1c56c3d178a5.zip | |
Merge pull request #4827 from acozzette/merge-3-6-x
Merge 3.6.x branch into master
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 ebbe1bb6..335e9114 100755 --- a/python/setup.py +++ b/python/setup.py @@ -203,11 +203,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') |