AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,751 Commits 35 Branches 138 Tags 124 MiB
3916a0aa99
Commit Graph

240 Commits

Author SHA1 Message Date
Jisi Liu
fb7a7c5f1f Bump version number for GA 2016-07-25 12:07:56 -07:00
Feng Xiao
932f94e16e Update version number to 3.0.0-beta-4 2016-07-13 16:08:47 -07:00
Feng Xiao
9086d96439 Integrate from internal code base. 2016-07-13 13:48:40 -07:00
Otto Kekäläinen
3808d091f8 Fix spelling in strings and comments 2016-07-03 15:26:04 +03:00
Adam Cozzette
b83af525db Fixed string formatting in text_format.py to be Python2.6-compatible 
In Python 2.6 the positional argument specifiers are apparently required
to be explicitly specified:
http://stackoverflow.com/questions/10054122/valueerror-zero-length-field-name-in-format-python
 2016-06-30 10:13:53 -07:00
Adam Cozzette
d64a2d9941 Integrated internal changes from Google 
This includes all internal changes from around May 20 to now.
 2016-06-29 15:38:03 -07:00
Josh Haberman
350453f2d5 Make surrogate regex even more lenient. 2016-06-06 17:14:58 -07:00
Josh Haberman
923d2c7ccf JSON surrogates Python: adjust regex for OSX error message. 
OS X's version of Python has a slightly different error
message for this error case.
 2016-06-06 13:57:59 -07:00
Josh Haberman
6a618949aa Added test for surrogates (valid and invalid). 2016-06-03 10:24:23 -07:00
Josh Haberman
4833b4c003 Surrogate checking is unpredictable, so always manually check. 2016-06-03 09:39:38 -07:00
Josh Haberman
bd98eae1c9 Fixed Python by updating failure lists and fixed a few broken tests. 
Python 2.x doesn't detect unpaired surrogates so we have to
do that manually.
 2016-06-03 09:39:38 -07:00
Jisi Liu
cbb9183e89 Merge pull request #1559 from google/beta-3 
Merge beta-3 release branch again.
 2016-05-18 11:44:56 -07:00
Jie Luo
b01b1a8ebe JSON format for Any message must print @type first, use OrderedDict instead of {} 2016-05-17 15:14:53 -07:00
Jisi Liu
b3bb46c51b Added download_url to be able to upload to pypi. 2016-05-17 10:50:43 -07:00
Jisi Liu
dbed8a0154 Update version numbers for beta3 2016-05-10 14:49:42 -07:00
Jisi Liu
f8a5c5f746 Fix using std::shared_ptr 2016-05-05 16:34:42 -07:00
Jisi Liu
75e5898513 Fix the std::string error introduced in integration. 2016-05-05 16:04:30 -07:00
Jisi Liu
cf14183bcd Down integrate from Google internal. 2016-04-28 14:34:59 -07:00
Jisi Liu
cba75ad404 Merge branch 'master' of github.com:google/protobuf 2016-04-01 16:46:49 -07:00
Manjunath Kudlur
cf828deb9b Linking the cpp implementation extension statically with libprotobuf 2016-04-01 15:58:48 -07:00
Jisi Liu
1bf446c71e Disable sign-compare warning. 2016-03-31 15:48:25 -07:00
Jisi Liu
7b1cbbd50e Fix signed-compare warning. 2016-03-31 15:38:10 -07:00
Jisi Liu
012ac9a0a6 revert unexpected change for py26 2016-03-31 15:26:22 -07:00
Manjunath Kudlur
1283625b0f Added an API to allow oversize protos when using C++ extension in Python 2016-03-31 14:14:58 -07:00
Jisi Liu
fc7eeda69c Fix json_format.py in py26 2016-03-31 13:36:32 -07:00
Jisi Liu
0de06f54bc Merge branch 'master' of github.com:google/protobuf 2016-03-30 11:43:44 -07:00
Jisi Liu
3b3c8abb96 Integrate google internal changes. 2016-03-30 11:39:59 -07:00
Joshua Haberman
3dd3238189 Merge pull request #1306 from silviulica/master 
Update version to 3.0.0b2.post2
 2016-03-07 16:31:48 -08:00
Silviu Calinoiu
4573edba76 Update version to 3.0.0b2.post2 2016-03-07 14:33:57 -08:00
Craig Citro
0e7c0c2fb8 Add back the namespace_packages arg in setup.py. 
Improves #1296.

The problem: in the previous patch, we tweaked the __init__.py files to use
namespaces, but no longer declared ourselves as a namespace package. The
second half was unwise.

Note that this only comes up when installing protobuf alongside another
package that also installs into the google namespace; as of right now, the
only PyPI package that does is googleapis-common-protos, though the GAE SDK
also uses google.appengine. Installing either or both of those alongside this
package now works.

The case that still remains is the upgrade path, which is also what worried me
in #713. It seems that if protobuf 2.6.1 is installed, there's no way to
safely upgrade that to work with a newer protobuf. However, `pip uninstall` &&
`pip install` does the trick.
 2016-03-05 00:10:11 -08:00
Silviu Calinoiu
786f80fe66 Add a modified patch from craigcitro@ to handle namespace sharing. 2016-02-18 16:12:11 -08:00
Manjunath Kudlur
99a3e30bd7 Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it when 
--allow_oversize_protos=true is passed to bazel build.
When this macro is set, SetTotalBytesLimit is called to remove
the 64MB limit on binary protos when during ParseFromString.
 2016-02-16 15:17:10 -08:00
CH Albach
5477f8cdba Manually down-integrate python JSON struct support from internal code base. 2016-01-29 18:10:50 -08:00
Josh Haberman
06fd6fa850 Fixed Python 3.x C++ build, and updated conformance failure lists. 2016-01-15 17:26:44 -08:00
Josh Haberman
e891c29f9b Allow conformance test runner to tolerate crashes, and re-enable conformance tests. 2016-01-11 16:15:46 -08:00
Josh Haberman
e1abdf2c76 Fixed compile for Python 3. There are still some crashes though. 2015-12-30 16:09:53 -08:00
Feng Xiao
283c40c897 Require six>=1.9 for Python. 
We use six sub-modules that aren't available in old versions. Not specifying
this requirement in the setup will lead to much less readable runtime errors.
It's particuarlly problematic for Mac OSX users because the system comes with
an old six version 1.4.1 by default.

[skip ci]
 2015-12-29 14:36:46 -08:00
Feng Xiao
b7610f129d Add missing files to EXTRA_DIST. 
Also delete some unused files.
 2015-12-28 14:18:49 -08:00
Feng Xiao
27b2423d6a Disable python conformnace tests as well. 
The testee program crashes on some inputs.

Change-Id: Iab27b80e29b7a56c5bd7cb4724531ecf9bb2823a
 2015-12-21 13:45:55 -08:00
Feng Xiao
a0b8fd52b9 Fix Python 2.6 test failures. 
Change-Id: Ia9e2795b1ff1abb30410ffb3ef96ba6f46dd99d0
 2015-12-21 13:43:13 -08:00
Feng Xiao
aa7e17a6f6 Update version numbers. 
Version number for beta languages is updated to v3.0.0-beta-2.
Version number for alpha languages is updated to v3.0.0-alpha-5.
 2015-12-21 11:31:51 -08:00
Feng Xiao
e841bac4fc Down-integrate from internal code base. 2015-12-11 17:10:28 -08:00
Manjunath Kudlur
96537c461a Bringing in internal::shared_ptr into google:protobuf namespace. 
Fixes #1029
 2015-12-09 07:40:30 -08:00
Manjunath Kudlur
3f9b4f2944 Updated for c++98 compatibility 2015-12-07 14:15:29 -08:00
Manjunath Kudlur
3ff1dca0bd Enable fast cpp protos in the python interface. 2015-12-07 13:08:21 -08:00
Josh Haberman
4b31ffa488 Added Python failure lists, and fixes to make sure failure propagates. 2015-12-03 12:54:54 -08:00
Josh Haberman
325392dd61 Conformance test implementation for Python. 2015-12-02 12:53:42 -08:00
Josh Haberman
c3ca920509 Pass $CC environment variable through tox. 2015-10-28 17:07:02 -07:00
Josh Haberman
d8814ed59e Special-case Clang-only warning flags to Clang. 2015-10-28 17:07:02 -07:00
Josh Haberman
30cbd4c561 Disable some more warnings to be warnings-free. 2015-10-28 17:05:47 -07:00