aboutsummaryrefslogtreecommitdiff
path: root/python
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | 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 masterJisi Liu2018-01-033-3/+3
|\|
| * Disable pip cache when testing uploaded packagesJisi Liu2017-12-221-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.1Jisi Liu2017-12-191-1/+1
| |
| * Fix file permission for python package.Feng Xiao2017-12-151-0/+1
| | | | | | | | `umask 0022` makes sure the created package will be accessible by all users.
| * 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 MessageMap
| * | 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.
| * | | Fix file permission for python package.Feng Xiao2017-12-141-0/+1
| |/ / | | | | | | | | | `umask 0022` makes sure the created package will be accessible by all users.
* / / 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
| | | | | | | | | | | | | | | | | | 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.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
| |/ | | | | | | | | | | | | 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 GoogleAdam Cozzette2017-12-0111-332/+462
|/
* Merge pull request #3770 from pherl/3.5-integrateJisi Liu2017-10-1914-38/+195
|\ | | | | Integrate google internal changes for the up coming 3.5 release.
| * Merge from google internalJisi Liu2017-10-1814-38/+195
| |
* | Merge pull request #3736 from jleni/fix_rbpiJisi Liu2017-10-182-2/+2
|\ \ | |/ |/| Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'"
| * 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' header
| * | python: do not include internal 'strutil.h' headerCristi Cobzarenco2017-01-281-1/+11
| | |
* | | Drop python2.6Jie Luo2017-08-221-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.6Jie Luo2017-08-221-1/+1
| | |
* | | Merge pull request #3529 from pherl/merge3.4.xJisi Liu2017-08-2130-206/+867
|\ \ \ | | | | | | | | Merge 3.4.x into master
| * \ \ 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
| | |\ \ | | | | | | | | | | Prefer system distributed binaries/libraries.
| | | * | Prefer system distributed binaries/libraries.Jisi Liu2017-08-161-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 upJisi Liu2017-08-161-3/+0
| | | | |
| | * | | Update testpypi addresses.Jisi Liu2017-08-161-6/+9
| | |/ / | | | | | | | | | | | | The old one is deprecated and no longer working.
| | * | Merge from masterJisi Liu2017-07-254-5/+12
| | | |
| | * | Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-242-1/+4
| | |\ \
| | | * | Add __bool__ as well as __nonzero__ for python3Jie Luo2017-07-241-0/+3
| | | | |
| | | * | Use keys() instead of iterkeys() to be python3 compatbile.Jie Luo2017-07-241-1/+1
| | | | |
| | * | | Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
| | |/ /
| | * | Fix code to use values() insteadJisi Liu2017-07-191-1/+1
| | | |
| | * | Use itmes() instead of itervalues() to be python3 compatbile.Jisi Liu2017-07-191-1/+1
| | | |
| | * | Merge master into 3.4.xJisi Liu2017-07-186-38/+162
| | |\ \
| | * | | Merge from Google internal for 3.4 releaseJisi Liu2017-07-1828-208/+863
| | | | |
* | | | | remove the parens from the cmp() lambda definition (#3526)cclauss2017-08-212-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 Luo2017-08-181-1/+1
| | | | | | | | | | | | This reverts commit 703f414ca6102e669ece2dcd5f7d9c2b05ca222e.
* | | | Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)cclauss2017-08-181-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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 23:26:37 +0000