Commit Graph

8576 Commits

Author SHA1 Message Date
Sandy Zhang
f286ae16f1 Update release notes. 2021-09-13 18:12:36 +00:00
Sandy Zhang
6901a36a62 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-09-13 17:56:05 +00:00
Sandy Zhang
6dd2176354 Sync from Piper @396393195
PROTOBUF_SYNC_PIPER
2021-09-13 17:56:05 +00:00
Sandy Zhang
565294d79f Remove duplicate build_ext class and get_ext_filename method 2021-09-11 00:14:28 +00:00
Sandy Zhang
5dcc8f2392 Add release notes. 2021-09-10 21:20:01 +00:00
Sandy Zhang
c43d053c1b Merge tag 'refs/tags/sync-piper' into sync-stage 2021-09-10 20:04:53 +00:00
Sandy Zhang
215dd1335b Sync from Piper @395989630
PROTOBUF_SYNC_PIPER
2021-09-10 20:04:52 +00:00
Joshua Haberman
7beab00b05
Merge pull request #8966 from jtattermusch/reintroduce_setuppy_aarch64
Reintroduce setup.py changes from #8280 erased by piper import #8902
2021-09-10 09:53:18 -07:00
Joshua Haberman
757615ae54
Merge pull request #8959 from VeryStrongFingers/patch-1
Update Field Presence doc
2021-09-10 08:14:38 -07:00
Jan Tattermusch
3efd68c793 Reintroduce setup.py changes from #8280 erased by piper import #8902 2021-09-10 09:53:31 +02:00
Mitchell Macpherson
c9dffbf3f4
Update field_presence.md 2021-09-10 11:40:00 +10:00
Joshua Haberman
75eff10d81
Merge pull request #8960 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2021-09-09 15:21:15 -07:00
Joshua Haberman
c70b4e570b Removed remaining dependence on six for Python. 2021-09-09 13:38:21 -07:00
Joshua Haberman
a76f5da9a0 Removed extraneous trailing backslashes. 2021-09-09 13:25:55 -07:00
Joshua Haberman
a33aa736fc Removed more testing of Python <3.5. 2021-09-09 13:20:34 -07:00
Joshua Haberman
1a662aa18d Disabled build_files_updated unittest for now. 2021-09-09 12:21:44 -07:00
Joshua Haberman
7adaf9eb79 Marked JS conformance runner as executable. 2021-09-09 11:33:31 -07:00
Joshua Haberman
f46293839e Removed redundant license header that confounded shebang line. 2021-09-09 11:14:48 -07:00
Joshua Haberman
b6d1e05d55 Removed google-internal annotation. 2021-09-09 10:06:21 -07:00
Joshua Haberman
4a81770b7f Reverted package change in test proto. 2021-09-09 10:01:41 -07:00
Joshua Haberman
bbf5d54ab7 Added missing source to Makefile.am. 2021-09-09 09:04:20 -07:00
Joshua Haberman
8b75c14592 Added release notes. 2021-09-09 08:31:29 -07:00
Joshua Haberman
018e2e7751 Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	src/google/protobuf/descriptor.pb.cc
#	src/google/protobuf/duration.pb.cc
#	src/google/protobuf/timestamp.pb.cc
#	src/google/protobuf/type.pb.cc
#	src/google/protobuf/wrappers.pb.cc
2021-09-09 08:23:12 -07:00
Joshua Haberman
e5c570bb57 Sync from Piper @395706834
PROTOBUF_SYNC_PIPER
2021-09-09 08:21:42 -07:00
Mitchell Macpherson
a52e00ed97
Update Field Presence doc
Updated information surrounding the usage of `optional` and the `--experimental_allow_proto3_optional` flag with relevant information between v3.12 & 3.15.

Since release v3.15:
>  Optional fields for proto3 are enabled by default, and no longer require
>  the --experimental_allow_proto3_optional flag.
2021-09-09 11:45:06 +10:00
Kevin Gibson
10d0faef6d
Use ReadVarint32 for Int32 types (#8769)
* Add INT32 to list of 32-bit varint types

* update descriptor protos

Co-authored-by: Greg Stoll <greg@gregstoll.com>
2021-09-03 11:56:48 -07:00
Jan Tattermusch
a8b73fb904
OSS benchmark script improvements: use java 11, remove tcmalloc, remove JS (#8918) 2021-09-03 09:24:32 -07:00
Joshua Haberman
768bc823ef
Merge pull request #8948 from compnerd/split-check
build: fix the support for CMake[<3.7]
2021-09-01 10:55:55 -07:00
Sil3ntStorm
7b9b7fe4a0
Fix unreachable code return in a case label that has a switch with only a default case in it, which returns already (#8927) 2021-09-01 10:03:40 -07:00
Saleem Abdulrasool
bf7a5e40a8 build: fix the support for CMake[<3.7]
The `VERSION_GREATER_EQUAL` operator was introduced in CMake 3.7.0
(released in 2016).  Use the long form of the check by splitting the
operation into two comparisons to support the older CMake.
2021-09-01 08:34:12 -07:00
Jan Tattermusch
4368383f0e
Merge pull request #8944 from jtattermusch/fix_arm64_dockcross_break
fix arm64 tests broken by dockcross image update
2021-09-01 13:23:41 +02:00
Jan Tattermusch
2bd61368de fix arm64 C++ tests broken by dockcross image update 2021-09-01 12:14:10 +02:00
Jan Tattermusch
981326af1d fix arm64 tests broken by dockcross image update 2021-09-01 11:38:23 +02:00
Derek Perez
2937b2ca63
Addresses duplicates identified in #8925 (#8939)
* Addresses duplicates identified in #8925

java_export aliases the rule name to the full maven_project_jar which consolidates all deps into a merged jar. This is not what we want for Bazel users.

* Update :util to match
2021-08-31 12:14:11 -07:00
Elliotte Rusty Harold
3bc229afae
add Stack Overflow as a possible support channel. (#8908)
* add Stack Overflow as a possible support channel.
2021-08-30 20:55:43 +00:00
Sil3ntStorm
c87e1ae597
Fix uninitialized variable warnings in descriptor.cc (#8931)
* Fix uninitialized variable use warnings in descriptor.cc AllocateFieldNames and AllocRawInternal

* Fix missing-field-initializers warning
2021-08-30 13:39:33 -07:00
Sil3ntStorm
ef6a9b2854
Fix cast truncates constant value warning (#8932) 2021-08-30 10:26:39 -07:00
Joshua Haberman
fe54248aba
Merge pull request #8917 from Sil3ntStorm/issue-6159
Use if constexpr in template functions
2021-08-30 09:20:42 -07:00
Sil3ntStorm
1473d74620
Disable conditional expression is constant warning (C4127) inside protobuf 2021-08-29 22:44:34 +02:00
Elliotte Rusty Harold
a3e5587447
Merge pull request #7855 from belugabehr/ObjectsRequireNonNull
Standardize NPE checks on JDK Objects utility
2021-08-29 12:43:27 +00:00
Joshua Haberman
f79f956b74
Merge pull request #8851 from compnerd/msvc-runtime-library
cmake: support `MSVC_RUNTIME_LIBRARY` property
2021-08-28 13:37:36 -07:00
Paul Yang
d6b6fdd114
Merge pull request #8919 from TeBoring/3.18.x-cherry
Cherry pick changes to fix python release
2021-08-27 15:50:16 -07:00
Adam Cozzette
0b0e404be9
Allocate 10 descriptor.proto extension numbers for COSI (#8921)
Fixes #8553.
2021-08-27 15:01:57 -07:00
Paul Yang
b0e1f289a5 Use a working docker image for build python release packages (#8916)
* Use a working docker image for build python release packages

* Update devtoolset-2-libatomic-devel to devtoolset-9-libatomic-devel
2021-08-27 14:10:24 -07:00
Bo Yang
f9758b546e Stick to a working version of docker file 2021-08-27 14:10:04 -07:00
Bo Yang
492be5130f Stop building wheel for python 3.5 2021-08-27 14:09:40 -07:00
Bo Yang
2fbc07b243 Stopping build wheel for python 2.7 2021-08-27 14:09:15 -07:00
Paul Yang
0ac5680be9
Merge pull request #8909 from acozzette/python27-fix 2021-08-27 13:50:59 -07:00
Elliotte Rusty Harold
8cf990fc9f
Updtae version to 3.17.3 (#8889) 2021-08-26 09:12:56 -07:00
Paul Yang
bcdb4ca4c7 No need to test python2.7 (#8891) 2021-08-26 07:46:36 -07:00