Commit Graph

660 Commits

Author SHA1 Message Date
Adam Cozzette
454778d011
Python: fix usages of deprecated assertRaisesRegxp (#9098)
assertRaisesRegexp has been deprecated in favor of the slightly
different spelling assertRaisesRegex. Let's fix this just to clean up a
bunch of deprecation warnings in the tests.
2021-10-15 19:00:04 -07:00
deannagarcia
df5b7fabb8
Merge pull request #7498 from psobot/add-python-descriptor-debug-string
Add GetDebugString to Python FileDescriptor interface.
2021-10-15 15:03:02 -07:00
deannagarcia
6c0168bd65
Merge pull request #7016 from roehling/fix-6205-unknown-fields-integer-overflow
Prevent integer overflow for unknown fields in Python
2021-10-15 14:59:57 -07:00
Adam Cozzette
f367bfb13d
Use dedicated helper functions for map descriptors (#9099)
The Descriptor class now has map_key() and map_value() methods for
accessing the special key and value fields in generated map entry
messages. This commit updates all the relevant code to use these
accessors instead of the clunkier FindFieldByName("key") or
FindFieldByName("value") approach.
2021-10-15 14:26:54 -07:00
Bu Sun Kim
c01cd6ec79
Add python 3.10 (#9034)
* Add python 3.10

* Update setup.py and tox.ini

* fix: fix 3.9 -> 3.10

* fix: py310-cpp
2021-10-15 10:24:49 -07:00
Peter Sobot
ef0bd1343b Only run GetDebugString test with cpp impl. 2021-10-15 11:39:21 -04:00
Timo Röhling
5100be2b77 Prevent integer overflow for unknown fields
The PyInt_FromLong() conversion function will truncate 64 bit integer
values on 32 bit architectures. We will now use the PyLong_* functions
with the appropriate minimum size for each field.

Note that this commit also switches to the unsigned versions, since the
unknown integer fields have been declared unsigned anyway.

Fixes #6205
2021-10-14 23:30:01 +02:00
Peter Sobot
4e176f29b4 Added GetDebugString to Python FileDescriptor interface. 2021-10-14 16:51:22 -04:00
deannagarcia
12f70b7c4d
Merge pull request #8122 from mamapanda/MessageToDict-fix
Make MessageToDict convert map keys to strings
2021-10-14 11:12:34 -07:00
Raul Bocanegra Algarra
e47ed057a5
Make glob recursive if option is enabled (#8783) 2021-10-13 09:13:18 -07:00
Adam Cozzette
3afc828309 Sync from Piper @401883098
PROTOBUF_SYNC_PIPER
2021-10-08 16:45:26 -07:00
Adam Cozzette
2a75e8ca58 Merge branch '3.18.x' into merge-3.18.x 2021-10-05 14:04:13 -07:00
Adam Cozzette
0dab03ba7b
Update protobuf version to 3.18.1 (#9051)
* Update protobuf version

* Update PHP release notes in package.xml
2021-10-04 17:43:33 -07:00
Josh Haberman
129b3e8a98 Merge branch 'master' into sync-stage 2021-09-28 15:28:48 +00:00
Joshua Haberman
567efd4c3e
Merge pull request #9026 from haberman/merge-release
Merge 3.18.x release branch to master
2021-09-27 17:55:39 -07:00
Joshua Haberman
2128ce074f Merge branch '3.18.x' into merge-release 2021-09-27 15:29:06 -07:00
Josh Haberman
28c52fd5c4 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-09-27 19:18:42 +00:00
Josh Haberman
624d29d833 Sync from Piper @399250367
PROTOBUF_SYNC_PIPER
2021-09-27 19:18:41 +00:00
AN Long
2fffff8320 Add python-requires in setup.py (#8989)
* Add python-requires in setup.py

* Update setup.py
2021-09-24 12:30:46 -07:00
AN Long
b75bb09551
Add python-requires in setup.py (#8989)
* Add python-requires in setup.py

* Update setup.py
2021-09-22 15:09:39 -07:00
Vasily Fomin
8b59d5367c
Fix typo in Descriptor docstring (#9001) 2021-09-22 14:11:29 -07:00
Paul Yang
12fb2b7450
Update protobuf version (#8973)
* Update protobuf version

* Update php notes
2021-09-13 12:34:03 -07:00
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
359594f4bb Removed Python 2.x support for Python. 2021-09-09 17:45:49 -07: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
Paul Yang
528b694e7c
Merge pull request #8920 from TeBoring/3.18.x-202108271437
Update protobuf version
2021-08-27 15:50:56 -07:00
Paul Yang
81771b9274
Add LICENSE to released python packages (#8913) 2021-08-27 15:41:58 -07:00
Bo Yang
d8f55782b0 Update protobuf version 2021-08-27 14:39:58 -07:00
Bo Yang
2fbc07b243 Stopping build wheel for python 2.7 2021-08-27 14:09:15 -07:00
Bo Yang
b84070eeaf Stopping build wheel for python 2.7 2021-08-26 13:19:21 -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
Paul Yang
3b0f10b936
No need to test python2.7 (#8891) 2021-08-20 08:49:08 -07:00
Paul Yang
7cbc08615f
Update protobuf version (#8887) 2021-08-18 17:20:20 -07:00
Bo Yang
04fc93f4b5 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-08-18 09:25:50 -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