Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge master branch. | Feng Xiao | 2018-08-08 | 3 | -8/+3 |
|\ | |||||
| * | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-08-01 | 1 | -1/+1 |
| |\ | |||||
| | * | Updated version numbers to 3.6.1 | Adam Cozzette | 2018-07-27 | 1 | -1/+1 |
| | | | |||||
| | * | fix python cpp kokoro build | Yilun Chong | 2018-07-15 | 1 | -1/+2 |
| | | | |||||
| * | | pyext needs c++11 in linux and mac. (#4930) | Arun Olappamanna Vasudevan | 2018-07-23 | 1 | -6/+1 |
| | | | |||||
| * | | Remove/replace travis references (#4953) | Feng Xiao | 2018-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | * Remove/replace travis references. | ||||
* | | | Down-integrate from google3. | Feng Xiao | 2018-08-08 | 50 | -849/+2328 |
|/ / | |||||
* | | fix python cpp kokoro build | Yilun Chong | 2018-07-12 | 1 | -1/+2 |
| | | |||||
* | | Add Python 3.7 compatibility (#4862) | Ben Webb | 2018-07-12 | 5 | -6/+6 |
| | | | | | | | | | | | | Compilation of Python wrappers fails with Python 3.7 because the Python folks changed their C API such that PyUnicode_AsUTF8AndSize() now returns a const char* rather than a char*. Add a patch to work around. Relates #4086. | ||||
* | | Update message_module.cc (#4835) | Thomas Colthurst | 2018-07-03 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | * Update message_module.cc Add missing piece from pull request #4698: actually initialize the new API object. * Update message_module.cc | ||||
* | | Fix capsule name. (#4836) | Thomas Colthurst | 2018-06-29 | 1 | -1/+1 |
| | | | | | | Internal convert file was broken. Change the capsule to the correct name | ||||
* | | Merge pull request #4827 from acozzette/merge-3-6-x | Adam Cozzette | 2018-06-25 | 2 | -5/+3 |
|\ \ | | | | | | | Merge 3.6.x branch into master | ||||
| * | | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-06-25 | 2 | -5/+3 |
| |\| | |||||
| | * | Always add -std=c++11 for mac (#4684) | Paul Yang | 2018-05-25 | 1 | -4/+2 |
| | | | |||||
| | * | Update version number to 3.6.0 | Jisi Liu | 2018-05-14 | 1 | -1/+1 |
| | | | |||||
* | | | Update minimal Python version to 2.7 (#4207) | Yuchen Xie | 2018-06-25 | 4 | -13/+5 |
|/ / | |||||
* | | global __version__ In setup.py (#4753) | cclauss | 2018-06-25 | 1 | -0/+1 |
| | | | | | | This change helps both humans and linters to understand the unusual method of instantiating this global variable. | ||||
* | | import inspect (#3507) | cclauss | 2018-06-11 | 1 | -0/+3 |
| | | | | | | Inspect is used five times on line 65-74 without being imported. | ||||
* | | Introduce Proto C API; based on cl/198113115 by amauryfa | Thomas Colthurst | 2018-05-30 | 4 | -1/+137 |
|/ | |||||
* | Fix python ext build on kokoro (#4527) | Yilun Chong | 2018-05-03 | 1 | -0/+2 |
| | |||||
* | Add __init__.py files to compiler and util subpackages (#4117) | Thomas Hisch | 2018-04-09 | 3 | -9/+1 |
| | | | | | | The compiler and util subpackages are created by the build_py class in setup.py. This has caused an issue in the protobuf package in conda-forge (https://github.com/conda-forge/protobuf-feedstock/issues/40), which is fixed by this commit. | ||||
* | For windows, all python version should use /MT (#4468) | Paul Yang | 2018-04-06 | 1 | -3/+1 |
| | |||||
* | 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! |