AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
5,269 Commits 35 Branches 138 Tags 124 MiB
860d693cf7
Commit Graph

330 Commits

Author SHA1 Message Date
Feng Xiao
77d32bc56c
Merge pull request #4053 from xfxyjwf/fixumask 
Fix file permission for python package.
 2017-12-15 12:09:19 -08:00
Feng Xiao
0fc85acdf2 Fix file permission for python package. 
`umask 0022` makes sure the created package will be accessible by all users.
 2017-12-14 17:54:18 -08:00
Jisi Liu
594ec2262c Fix python descriptor test. 2017-12-14 11:16:34 -08:00
Adam Cozzette
0ba8eea655 Merge branch 'master' into down-integrate 2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
Adam Cozzette
a27da09339 Merge branch '3.5.x' into 3.5.x-merge 2017-11-30 13:34:51 -08:00
Jisi Liu
cf65a7946f Update version for 3.5.0.post1 2017-11-22 14:05:10 -08:00
Jie Luo
45d99a15f3
Add _file_desc_by_toplevel_extension back 
Add _file_desc_by_toplevel_extension back for compatibility issue with 3.4.1.

_file_desc_by_toplevel_extension is a temporary solution for FieldDescriptor.file.
FieldDescriptor.file was added in code gen. However, we need to keep it for some time for compatibility reason (with 3.4.1 only). May try to remove it after 2 years.
 2017-11-22 13:59:11 -08:00
Paul Kilgo
9935829a66 Include .cc and .h files in source distribution 2017-11-17 15:30:31 -08:00
Jisi Liu
97dd175a91 Update version number to 3.5.0 2017-11-02 14:16:22 -07:00
Roman Nekhoroshev
da3bfa693a
Fix a typo in WKT's test suite 
Hi!
Sorry for bothering with such a minor thing, but I just noticed and fixed one annoying typo in WKT's test suite:
`"accpets" -> "accepts"`

Thanks!
 2017-11-02 13:47:11 -07:00
Jisi Liu
07b9238a1c Merge pull request #3770 from pherl/3.5-integrate 
Integrate google internal changes for the up coming 3.5 release.
 2017-10-19 10:48:54 -07:00
Jisi Liu
30bfe36b6a Merge pull request #3736 from jleni/fix_rbpi 
Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'"
 2017-10-18 12:56:04 -07:00
Jisi Liu
1a7a7fca80 Merge from google internal 2017-10-18 12:22:18 -07:00
Jisi Liu
de15e73d58 Merge remote-tracking branch 'origin/3.4.x' into master 2017-10-11 14:44:03 -07:00
Juan Leni
08334f0908 Converting to immutable hashable types 2017-10-11 06:46:25 +02:00
Jisi Liu
dba647a6b2 Bump version for minor release 2017-09-14 11:12:55 -07:00
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Feng Xiao
2ad5c0a864 Merge pull request #2576 from cristicbz/py-strutil 
python: do not include internal 'strutil.h' header
 2017-09-08 10:23:14 -07:00
Jie Luo
610e433888 Drop python2.6 
Jenkins complains for python 2.6
DEPRECATION: Python 2.6 is no longer supported by the Python core team
ERROR: InvocationError: '/tmp/protobuf/protobuf/python/.tox/py26-cpp/bin/python setup.py -q build_py'
https://grpc-testing.appspot.com/job/protobuf_pull_request/1502/testReport/junit/(root)/python_cpp/python_cpp/
 2017-08-22 16:39:26 -07:00
Jie Luo
028d6f13ee Add Python 3.5 3.6 2017-08-22 15:59:27 -07:00
Jisi Liu
ba4e54724d Merge pull request #3529 from pherl/merge3.4.x 
Merge 3.4.x into master
 2017-08-21 10:39:27 -07:00
cclauss
472f700884 remove the parens from the cmp() lambda definition (#3526) 
* remove the parens from the cmp() lambda definition

https://github.com/PythonCharmers/python-future/pull/298

* remove the parens from the cmp() lambda definition

https://github.com/PythonCharmers/python-future/pull/298
 2017-08-21 10:21:11 -07:00
Jisi Liu
139775ccc0 Merge remote-tracking branch 'origin/3.4.x' into mergemaster 2017-08-18 16:25:35 -07:00
Jisi Liu
fdb5cd5e4b Merge pull request #3504 from pherl/3.4.x 
Prefer system distributed binaries/libraries.
 2017-08-18 16:19:45 -07:00
Jie Luo
c2aa26e507 Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524) 
This reverts commit 703f414ca6.
 2017-08-18 13:15:06 -07:00
cclauss
703f414ca6 Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512) 
* Drop Python 3.3 from testing & add Python 3.5, 3.6

Python 3.3 goes [EOL](https://docs.python.org/devguide/index.html#branchstatus) next month.

* Sync test.sh with the Python versions in tox.ini
 2017-08-18 10:14:00 -07:00
cclauss
a04eb8c191 Define cmp() for Python 3 (#3517) 
* Define cmp() for Python 3

http://python-future.org/compatible_idioms.html?highlight=cmp#cmp

* Define cmp() for Python 3

http://python-future.org/compatible_idioms.html?highlight=cmp#cmp
 2017-08-18 10:13:10 -07:00
cclauss
dded80f924 define long() for Python 3 2017-08-18 01:41:27 +02:00
cclauss
958412e2e6 Old style exception --> new style exception 2017-08-17 19:25:39 +02:00
Jisi Liu
98c6d04df4 Prefer system distributed binaries/libraries. 
It seems like the image has a /usr/local/bin/autoconf installed, which
doesn't recognize/work with the yum installed libtools. Putting
distributed binaries/libraries first solves the problem
 2017-08-16 13:34:14 -07:00
Jisi Liu
5d5df84913 clean up 2017-08-16 10:35:00 -07:00
Jisi Liu
19a7e2099b Update testpypi addresses. 
The old one is deprecated and no longer working.
 2017-08-16 10:30:38 -07:00
Jie Luo
f5817b3056 PY26 tests compatibility 
1, Some tests in reflection_test PY26 raise TypeError but other versions raise ValueError for convert negative long to unsigned
2, Change compare exception type to compare exception str for testDuplicateExtensionNumber. Original code raise 'Double registration of Extensions' is not an instance of (<type 'exceptions.AssertionError'>, <type 'exceptions.ValueError'>) for PY26 cpp implementation

t
 2017-08-04 15:25:11 -07:00
Jie Luo
9150cd8603 Skip setUpClass which is newly added in python2.7 for python2.6 2017-08-04 10:50:24 -07:00
Jisi Liu
759245a49a Merge from master 2017-07-25 11:52:33 -07:00
Jisi Liu
ce4416705b Merge remote-tracking branch 'origin/3.4.x' into vb 2017-07-24 20:44:59 -07:00
Jie Luo
9c012ed07d Add __bool__ as well as __nonzero__ for python3 2017-07-24 16:42:23 -07:00
Jisi Liu
7bb39bef1a Update version number for 3.4.0 2017-07-24 16:03:49 -07:00
Jie Luo
a484794820 Use keys() instead of iterkeys() to be python3 compatbile. 2017-07-24 15:44:16 -07:00
Yilun Chong
a713b73076 Merge pull request #3281 from BSBandme/ConformanceTestYilunChong 
Proto2 test message support to conformance test
 2017-07-24 14:50:52 -07:00
Feng Xiao
062df3d072 Merge pull request #3179 from bjwatson/fix-duration-typo 
Fix typos in comment
 2017-07-20 13:01:04 -07:00
Jie Luo
bba4c4ae51 Merge pull request #3262 from snnn/master 
Make it compatible with python 3.6.1
 2017-07-19 16:25:05 -07:00
Jisi Liu
dd091aad48 Fix code to use values() instead 2017-07-19 15:00:19 -07:00
Jisi Liu
b07cdb6e8e Use itmes() instead of itervalues() to be python3 compatbile. 2017-07-19 13:55:58 -07:00
Paul Yang
50aa4febaf Merge pull request #3375 from TeBoring/3.3.x 
Merge 3.3.x into master
 2017-07-19 06:58:05 -07:00
Jisi Liu
3af881c7e2 Merge master into 3.4.x 2017-07-18 16:26:16 -07:00
Jisi Liu
09354db143 Merge from Google internal for 3.4 release 2017-07-18 15:38:30 -07:00
Bo Yang
6ec0b7e4d1 Merge 3.3.x into master 2017-07-18 11:06:16 -07:00
Jie Luo
b764e67812 Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance test 2017-07-17 14:34:54 -07:00