Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| | * | | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Fix code to use values() instead | Jisi Liu | 2017-07-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Use itmes() instead of itervalues() to be python3 compatbile. | Jisi Liu | 2017-07-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 6 | -38/+162 |
| | |\ \ | |||||
| | * | | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 28 | -208/+863 |
| | | | | | |||||
* | | | | | remove the parens from the cmp() lambda definition (#3526) | cclauss | 2017-08-21 | 2 | -4/+4 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524) | Jie Luo | 2017-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 703f414ca6102e669ece2dcd5f7d9c2b05ca222e. | ||||
* | | | | Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512) | cclauss | 2017-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | Define cmp() for Python 3 (#3517) | cclauss | 2017-08-18 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | define long() for Python 3 | cclauss | 2017-08-18 | 1 | -5/+9 |
| | | | | |||||
* | | | | Old style exception --> new style exception | cclauss | 2017-08-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | PY26 tests compatibility | Jie Luo | 2017-08-04 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | Skip setUpClass which is newly added in python2.7 for python2.6 | Jie Luo | 2017-08-04 | 1 | -2/+3 |
| | | | | |||||
* | | | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChong | Yilun Chong | 2017-07-24 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Proto2 test message support to conformance test | ||||
| * \ \ \ | Merge branch 'master' into ConformanceTestYilunChong | Yilun Chong | 2017-06-30 | 4 | -0/+116 |
| |\ \ \ \ | |||||
| * | | | | | add proto2 supported for cpp,python,nodejs,ruby,php | Yilun Chong | 2017-06-27 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #3179 from bjwatson/fix-duration-typo | Feng Xiao | 2017-07-20 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix typos in comment | ||||
| * | | | | | | Fix typos in comment | Brian J. Watson | 2017-06-21 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3262 from snnn/master | Jie Luo | 2017-07-19 | 3 | -5/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make it compatible with python 3.6.1 | ||||
| * | | | | | | Fix a bazel build error on Windows | Changming Sun | 2017-06-22 | 3 | -5/+11 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3375 from TeBoring/3.3.x | Paul Yang | 2017-07-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Merge 3.3.x into master | ||||
| * | | | | | Merge 3.3.x into master | Bo Yang | 2017-07-18 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Update version number to 3.3.2 | Bo Yang | 2017-06-21 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update version number to 3.3.1 | Feng Xiao | 2017-05-08 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
* | / | | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance test | Jie Luo | 2017-07-17 | 1 | -0/+1 |
|/ / / / | |||||
* | / / | Add scripts to build python wheel for linux. (#2693) | Paul Yang | 2017-06-28 | 4 | -0/+116 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | * Add scripts to build python wheel for linux. Followed PEP513. * Fix dist check for new added files. * Update README for usage example. | ||||
* | | | Fix Markdown formatting in README. | Misha Brukman | 2017-05-23 | 1 | -38/+45 |
|/ / | | | | | | | | | | | | | | | | | | | Fix indentation to enable code formatting for sample command lines to set them visually apart from the surrounding text, and make it easy to copy-paste. Add code formatting for env vars, paths, binary and library names for readability. Hide URLs behind text for readability and conciseness. | ||||
* | | Fix python3 issue. | Feng Xiao | 2017-04-20 | 1 | -1/+1 |
| | | |||||
* | | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) | Jie Luo | 2017-04-10 | 3 | -6/+41 |
| | | | | | | | | | | | | * Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() * Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions. |