AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
8,585 Commits 35 Branches 138 Tags 124 MiB
69b0a78315
Commit Graph

629 Commits

Author SHA1 Message Date
Sandy Zhang
565294d79f Remove duplicate build_ext class and get_ext_filename method 2021-09-11 00:14:28 +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
Jan Tattermusch
3efd68c793 Reintroduce setup.py changes from #8280 erased by piper import #8902 2021-09-10 09:53:31 +02:00
Joshua Haberman
c70b4e570b Removed remaining dependence on six for Python. 2021-09-09 13:38:21 -07:00
Joshua Haberman
a33aa736fc Removed more testing of Python <3.5. 2021-09-09 13:20:34 -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
Bo Yang
2fbc07b243 Stopping build wheel for python 2.7 2021-08-27 14:09:15 -07:00
Paul Yang
bcdb4ca4c7 No need to test python2.7 (#8891) 2021-08-26 07:46:36 -07:00
Adam Cozzette
4eed0dab5a Sync from Piper @392076391 
PROTOBUF_SYNC_PIPER
 2021-08-20 15:05:53 -07:00
Bo Yang
509aee4b8b Sync from Piper @391414001 
PROTOBUF_SYNC_PIPER
 2021-08-17 17:26:34 -07:00
Adam Cozzette
5d03f8c8a5 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-08-03 12:25:42 -07:00
Adam Cozzette
562fc946c7 Sync from Piper @388508285 
PROTOBUF_SYNC_PIPER
 2021-08-03 11:58:05 -07:00
Matt Kulukundis
d835808b7a remove various broken build status tags 2021-07-29 10:14:29 -04:00
Ilya Konstantinov
991bcada05
Raise ParseError when JSON string is expected and not given (#7935) 
Raise ParseError when JSON string is expected and not given
 2021-06-27 06:57:47 +08:00
Jan Tattermusch
f4360f0a89 reintroduce setup.py changes from #8280 erased by piper import #8617 2021-06-18 12:38:47 +02:00
Deanna Garcia
367851d124 Update protobuf version 2021-06-04 21:21:39 +00:00
Paul Yang
548e01324e
Merge pull request #8689 from deannagarcia/merge3.17.2 
Merge 3.17.x into master
 2021-06-03 10:39:39 -07:00
Deanna Garcia
506f2273d1 Merging 3.17.x branch into master 2021-06-02 22:29:40 +00:00
Paul Yang
bd42fcc7a3
Merge pull request #8652 from haberman/sync-stage 
Integrate from Piper for C++, Java, and Python
 2021-06-01 15:20:53 -07:00
Adam Cozzette
d2f6d9b721
Merge pull request #8650 from acozzette/merge-3.17.x 
Merge 3.17.x into master
 2021-05-27 08:05:54 -07:00
Deanna Garcia
5b8208ecea Update protobuf version 2021-05-25 19:36:05 +00:00
Joshua Haberman
a8d8eb17df Merge tag 'refs/tags/sync-piper' into sync-stage 2021-05-24 13:49:40 -07:00
Joshua Haberman
9521803d40 Sync from Piper @375548932 
PROTOBUF_SYNC_PIPER
 2021-05-24 13:49:39 -07:00
Adam Cozzette
52784ced2f
Update protobuf version (#8633) 2021-05-19 16:43:44 -07:00
Deanna Garcia
cab253ec5e Removing python_protobuf.h/cc 2021-05-14 22:35:38 +00:00
Deanna Garcia
f66dea481d Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
#	src/google/protobuf/repeated_field_unittest.cc
 2021-05-14 21:56:03 +00:00
Deanna Garcia
380e352b0b Sync from Piper @373820256 
PROTOBUF_SYNC_PIPER
 2021-05-14 17:50:31 +00:00
Adam Cozzette
652d99a8ee
Update protobuf version (#8606) 2021-05-12 16:20:18 -07:00
Adam Cozzette
f807c02226
Update protobuf version to 3.17.0-rc2 (#8586) 
* Update protobuf version

* Updated Kotlin versions and updated script to handle them
 2021-05-10 15:31:35 -07:00
Adam Cozzette
7025f37cde
Update protobuf version (#8575) 2021-05-07 09:51:15 -07:00
Yuriy Chernyshov
c8389f8ed5
Fix constness issue detected by MSVC standard conforming mode (#8568) 
This is the continuation of #8344
 2021-05-06 09:09:22 -07:00
Adam Cozzette
f98b287125
Remove Python compatibility tests (#8570) 2021-05-05 13:02:38 -07:00
Joshua Haberman
67044a2820 Reinstate the Python change that was somehow reverted in the sync. 2021-04-30 16:28:12 -07:00
Joshua Haberman
535ddf1c4f Merge tag 'refs/tags/sync-piper' into sync-stage 2021-04-30 16:12:51 -07:00
Joshua Haberman
f5fd897c1d Sync from Piper @371422642 
PROTOBUF_SYNC_PIPER
 2021-04-30 16:12:50 -07:00
Roy Williams
7ad0fd4ed7
Make libprotobuf symbols local on OSX (#8346) 
@gnossen gave a great overview in https://github.com/grpc/grpc/pull/24992 of the overall problem.

If a python process using both protobuf _and_ another native library linking in libprotobuf
frequently can cause crashes.  This seems to frequently affect tensorflow as well:

tensorflow/tensorflow#8394,
tensorflow/tensorflow#9525 (comment)
tensorflow/tensorflow#24976,
tensorflow/tensorflow#35573,
https://github.com/tensorflow/tensorflow/blob/v2.0.0/tensorflow/contrib/makefile/rename_protobuf.sh,
tensorflow/tensorflow#16104

Testing locally this fixes both crashes when linking in multiple versions of protobuf
and fixes `DescriptorPool` clashes as well (e.g. Python and Native code import different versions of the same message).
 2021-04-23 20:03:01 -07:00
Yuriy Chernyshov
c784b65b2a
Remove unused python_protobuf.{cc,h} (#8513) 
* Remove unused python_protobuf.{cc,h} #8513

* Fix automake input
 2021-04-19 15:58:33 -07:00
Joshua Haberman
ba3836703b Sync from Piper @368866736 
PROTOBUF_SYNC_PIPER
 2021-04-16 09:55:03 -07:00
Joshua Haberman
c5c33d29dd Merge tag 'refs/tags/sync-piper' into sync-stage 2021-04-16 09:55:03 -07:00
Joshua Haberman
e8cb1b8da2 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	src/google/protobuf/compiler/cpp/cpp_helpers.cc
#	src/google/protobuf/port_def.inc
 2021-04-15 16:03:26 -07:00
Joshua Haberman
ce560630bf Sync from Piper @368734211 
PROTOBUF_SYNC_PIPER
 2021-04-15 15:53:17 -07:00
Adam Cozzette
5679811239 Merge branch '3.15.x' into merge-3-15-x 2021-04-08 10:54:02 -07:00
Adam Cozzette
436bd7880e
Updated version to 3.15.8 (#8463) 
* Update protobuf version

* Updated CHANGES.txt and package.xml for 3.15.8
 2021-04-07 15:38:38 -07:00
Matt Fowles Kulukundis
c2148566c7
Merge pull request #8327 from alkasm/alkasm/method-desc-copy-to-proto 
[python-runtime] Add MethodDescriptor.CopyToProto()
 2021-04-07 16:02:22 -04:00
Alexander Reynolds
3c782fc3d6 Remove py impl skip for method desc CopyToProto test 2021-04-07 02:21:46 -07:00
Adam Cozzette
87aa9adb86 Merge branch 'master' into 3.15.x 2021-04-02 14:55:02 -07:00
Adam Cozzette
878be3569e Update protobuf version 2021-04-02 11:06:56 -07:00
Joshua Haberman
c0c6cad184 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	src/google/protobuf/stubs/statusor.h
 2021-03-30 12:37:32 -07:00