aboutsummaryrefslogtreecommitdiff
path: root/python
Commit message (Expand)AuthorAgeFilesLines
* Updated version numbers to 3.6.1Adam Cozzette2018-07-271-1/+1
* fix python cpp kokoro buildYilun Chong2018-07-151-1/+2
* Always add -std=c++11 for mac (#4684)Paul Yang2018-05-251-4/+2
* Update version number to 3.6.0Jisi Liu2018-05-141-1/+1
* Fix python ext build on kokoro (#4527)Yilun Chong2018-05-031-0/+2
* Add __init__.py files to compiler and util subpackages (#4117)Thomas Hisch2018-04-093-9/+1
* For windows, all python version should use /MT (#4468)Paul Yang2018-04-061-3/+1
* Merge branch (#4466)Paul Yang2018-04-022-5/+23
* Removed unused variables in repeated_scalar_container.ccAdam Cozzette2018-03-201-12/+0
* Removed unused code pertaining to shared_ptrAdam Cozzette2018-03-201-7/+0
* Added pyext/thread_unsafe_shared_ptr.hAdam Cozzette2018-03-201-0/+104
* Removed unrecognized option from no_package.protoAdam Cozzette2018-03-201-3/+1
* Include no_package.proto in Python testAdam Cozzette2018-03-141-0/+1
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-4/+9
|\
| * Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Jie Luo2018-02-091-4/+9
* | Integrated internal changes from GoogleAdam Cozzette2018-03-1325-403/+746
|/
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-6/+3
|\
| * Fix uploading binary wheel.Jisi Liu2017-12-221-6/+3
* | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-033-3/+3
|\|
| * Disable pip cache when testing uploaded packagesJisi Liu2017-12-221-1/+2
| * Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
| * Fix file permission for python package.Feng Xiao2017-12-151-0/+1
| * Remove py2.6 support.Jisi Liu2017-12-141-1/+0
* | Merge pull request #4030 from cyyber/masterFeng Xiao2017-12-202-13/+7
|\ \
| * | Calling Keychecker before checking key in MessageMapcyyber2017-12-152-13/+7
* | | Merge pull request #4053 from xfxyjwf/fixumaskFeng Xiao2017-12-151-0/+1
|\ \ \
| * | | Fix file permission for python package.Feng Xiao2017-12-141-0/+1
| |/ /
* / / Fix python descriptor test.Jisi Liu2017-12-141-0/+13
|/ /
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-013-2/+5
|\ \
| * | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-302-2/+11
| |\|
| | * Update version for 3.5.0.post1Jisi Liu2017-11-221-1/+1
| | * Add _file_desc_by_toplevel_extension backJie Luo2017-11-221-1/+10
| | * Update version number to 3.5.0Jisi Liu2017-11-021-1/+1
| * | Include .cc and .h files in source distributionPaul Kilgo2017-11-171-0/+3
| * | Fix a typo in WKT's test suiteRoman Nekhoroshev2017-11-021-1/+1
| |/
* / Integrated internal changes from GoogleAdam Cozzette2017-12-0111-332/+462
|/
* Merge pull request #3770 from pherl/3.5-integrateJisi Liu2017-10-1914-38/+195
|\
| * Merge from google internalJisi Liu2017-10-1814-38/+195
* | Merge pull request #3736 from jleni/fix_rbpiJisi Liu2017-10-182-2/+2
|\ \ | |/ |/|
| * Converting to immutable hashable typesJuan Leni2017-10-112-2/+2
* | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-1/+1
|\ \ | |/ |/|
| * Bump version for minor releaseJisi Liu2017-09-141-1/+1
* | Integrated internal changes from GoogleAdam Cozzette2017-09-1424-409/+1316
* | Merge pull request #2576 from cristicbz/py-strutilFeng Xiao2017-09-081-1/+11
|\ \
| * | python: do not include internal 'strutil.h' headerCristi Cobzarenco2017-01-281-1/+11
* | | Drop python2.6Jie Luo2017-08-221-1/+1
* | | Add Python 3.5 3.6Jie Luo2017-08-221-1/+1
* | | Merge pull request #3529 from pherl/merge3.4.xJisi Liu2017-08-2130-206/+867
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1830-206/+867
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #3504 from pherl/3.4.xJisi Liu2017-08-181-0/+3
| | |\ \