Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch (#4466) | Paul Yang | 2018-04-02 | 2 | -5/+23 |
| | | | | | | | | * Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits | ||||
* | Removed unused variables in repeated_scalar_container.cc | Adam Cozzette | 2018-03-20 | 1 | -12/+0 |
| | |||||
* | Removed unused code pertaining to shared_ptr | Adam Cozzette | 2018-03-20 | 1 | -7/+0 |
| | |||||
* | Added pyext/thread_unsafe_shared_ptr.h | Adam Cozzette | 2018-03-20 | 1 | -0/+104 |
| | |||||
* | Removed unrecognized option from no_package.proto | Adam Cozzette | 2018-03-20 | 1 | -3/+1 |
| | |||||
* | Include no_package.proto in Python test | Adam Cozzette | 2018-03-14 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 | 1 | -4/+9 |
|\ | |||||
| * | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262) | Jie Luo | 2018-02-09 | 1 | -4/+9 |
| | | | | | | | | * Cython's stack does not have .py file name. Only check filenames when end with .py for _CalledFromGeneratedFile() | ||||
* | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 25 | -403/+746 |
|/ | |||||
* | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 1 | -6/+3 |
|\ | |||||
| * | Fix uploading binary wheel. | Jisi Liu | 2017-12-22 | 1 | -6/+3 |
| | | | | | | | | | | The script now takes two prompt for user name and password. One single input redirection no longer works. | ||||
* | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 3 | -3/+3 |
|\| | |||||
| * | Disable pip cache when testing uploaded packages | Jisi Liu | 2017-12-22 | 1 | -1/+2 |
| | | | | | | | | | | | | | | Otherwise, pip complains "cannot find a version satisfies the requirement." I suspect it was due to caching issues. I usued to manually add a `sleep 30` between the upload and the installation test which is quite unstable. | ||||
| * | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | | |||||
| * | Fix file permission for python package. | Feng Xiao | 2017-12-15 | 1 | -0/+1 |
| | | | | | | | | `umask 0022` makes sure the created package will be accessible by all users. | ||||
| * | Remove py2.6 support. | Jisi Liu | 2017-12-14 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #4030 from cyyber/master | Feng Xiao | 2017-12-20 | 2 | -13/+7 |
|\ \ | | | | | | | Calling Keychecker before checking key in MessageMap | ||||
| * | | Calling Keychecker before checking key in MessageMap | cyyber | 2017-12-15 | 2 | -13/+7 |
| | | | |||||
* | | | Merge pull request #4053 from xfxyjwf/fixumask | Feng Xiao | 2017-12-15 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Fix file permission for python package. | ||||
| * | | | Fix file permission for python package. | Feng Xiao | 2017-12-14 | 1 | -0/+1 |
| |/ / | | | | | | | | | | `umask 0022` makes sure the created package will be accessible by all users. | ||||
* / / | Fix python descriptor test. | Jisi Liu | 2017-12-14 | 1 | -0/+13 |
|/ / | |||||
* | | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 3 | -2/+5 |
|\ \ | |||||
| * | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 2 | -2/+11 |
| |\| | |||||
| | * | Update version for 3.5.0.post1 | Jisi Liu | 2017-11-22 | 1 | -1/+1 |
| | | | |||||
| | * | Add _file_desc_by_toplevel_extension back | Jie Luo | 2017-11-22 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 1 | -1/+1 |
| | | | |||||
| * | | Include .cc and .h files in source distribution | Paul Kilgo | 2017-11-17 | 1 | -0/+3 |
| | | | |||||
| * | | Fix a typo in WKT's test suite | Roman Nekhoroshev | 2017-11-02 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | 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! | ||||
* / | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 11 | -332/+462 |
|/ | |||||
* | Merge pull request #3770 from pherl/3.5-integrate | Jisi Liu | 2017-10-19 | 14 | -38/+195 |
|\ | | | | | Integrate google internal changes for the up coming 3.5 release. | ||||
| * | Merge from google internal | Jisi Liu | 2017-10-18 | 14 | -38/+195 |
| | | |||||
* | | Merge pull request #3736 from jleni/fix_rbpi | Jisi Liu | 2017-10-18 | 2 | -2/+2 |
|\ \ | |/ |/| | Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'" | ||||
| * | Converting to immutable hashable types | Juan Leni | 2017-10-11 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Bump version for minor release | Jisi Liu | 2017-09-14 | 1 | -1/+1 |
| | | |||||
* | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 24 | -409/+1316 |
| | | |||||
* | | Merge pull request #2576 from cristicbz/py-strutil | Feng Xiao | 2017-09-08 | 1 | -1/+11 |
|\ \ | | | | | | | python: do not include internal 'strutil.h' header | ||||
| * | | python: do not include internal 'strutil.h' header | Cristi Cobzarenco | 2017-01-28 | 1 | -1/+11 |
| | | | |||||
* | | | Drop python2.6 | Jie Luo | 2017-08-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | 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/ | ||||
* | | | Add Python 3.5 3.6 | Jie Luo | 2017-08-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3529 from pherl/merge3.4.x | Jisi Liu | 2017-08-21 | 30 | -206/+867 |
|\ \ \ | | | | | | | | | Merge 3.4.x into master | ||||
| * \ \ | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 30 | -206/+867 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge pull request #3504 from pherl/3.4.x | Jisi Liu | 2017-08-18 | 1 | -0/+3 |
| | |\ \ | | | | | | | | | | | Prefer system distributed binaries/libraries. | ||||
| | | * | | Prefer system distributed binaries/libraries. | Jisi Liu | 2017-08-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | clean up | Jisi Liu | 2017-08-16 | 1 | -3/+0 |
| | | | | | |||||
| | * | | | Update testpypi addresses. | Jisi Liu | 2017-08-16 | 1 | -6/+9 |
| | |/ / | | | | | | | | | | | | | The old one is deprecated and no longer working. | ||||
| | * | | Merge from master | Jisi Liu | 2017-07-25 | 4 | -5/+12 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/3.4.x' into vb | Jisi Liu | 2017-07-24 | 2 | -1/+4 |
| | |\ \ | |||||
| | | * | | Add __bool__ as well as __nonzero__ for python3 | Jie Luo | 2017-07-24 | 1 | -0/+3 |
| | | | | | |||||
| | | * | | Use keys() instead of iterkeys() to be python3 compatbile. | Jie Luo | 2017-07-24 | 1 | -1/+1 |
| | | | | |