aboutsummaryrefslogtreecommitdiff
path: root/python
Commit message (Collapse)AuthorAgeFilesLines
* Fix python versions to comply with pep-0440.Jisi Liu2015-03-042-2/+14
| | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c
* Merge remote-tracking branch 'github/alpha-2-fix'Jisi Liu2015-03-041-1/+1
|\ | | | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e
| * Fix python package version to alpha-2.Jisi Liu2015-03-041-1/+1
| | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf
* | Merge pull request #225 from google/post-alpha2-integrateJisi Liu2015-03-036-15/+22
|\ \ | | | | | | Post alpha2 integrate from google internal for C++ and Java
| * | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-286-15/+22
| |/ | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* / Bump the version number to 3.0.0-alpha-3-preJisi Liu2015-03-021-1/+1
|/ | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e
* Fixes for Python/C++ implementation in open-source:Josh Haberman2015-02-259-23/+484
| | | | | | | | | | | | | * Rosy hack doesn't apply (that test should be removed for the open-source release). * Added our own copy of parameterized.py (the open-source version of Google Apputils doesn't contain it). * The C++ Descriptor object didn't implement extension_ranges. * Had to implement a hack around returning EncodeError, to work around the module-loading behavior of the test runner.
* Down integrate from Google internal.Jisi Liu2015-02-2536-2077/+5690
| | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
* Update version number to 3.0.0-alpha-2Jisi Liu2015-02-211-1/+1
| | | | Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2
* Delete unused files.Feng Xiao2015-01-271-27/+0
|
* Merge pull request #143 from Ivoz/patch-1Feng Xiao2014-12-221-2/+2
|\ | | | | Update python version / setuptools instructions
| * Update python version / setuptools instructionsMatt Iversen2014-12-171-2/+2
| | | | | | | | | | Reflect the change that protobuf should now only be supporting 2.6+ (I'd guess note python 3.x+ when its supported in implementation) Refer to the Python Packaging User Guide for installing setuptools (and pip) instead of out of date telecommunity guide.
* | Merge pull request #46 from adalq/versionFeng Xiao2014-12-201-0/+35
|\ \ | |/ |/| Add __version__
| * Updated __version__Adal Chiriliuc2014-12-141-1/+1
| |
| * Add __version__Adal Chiriliuc2014-10-101-0/+35
| | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__"
| * Revert "Add __version__"Adal Chiriliuc2014-10-102-35/+0
| | | | | | | | This reverts commit 5337cf564f5eb43c1975d1cfd87b4efba9e6bf35.
| * Add __version__Adal Chiriliuc2014-10-102-0/+35
| | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__"
* | Update version number to v3.0.0-preFeng Xiao2014-12-101-1/+1
| |
* | Update version number to v3.0.0-alpha-1Feng Xiao2014-12-031-1/+1
| |
* | Fix Python C++ implementation build issues:Feng Xiao2014-11-252-5/+9
| | | | | | | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword.
* | Down-integrate from internal code base.Feng Xiao2014-11-201-1/+1
| |
* | Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-143-24/+20
| |
* | Merge branch 'typofixes-vlajos-20141108' of ↵Feng Xiao2014-11-116-6/+6
|\ \ | | | | | | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc
| * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-086-6/+6
| | |
* | | Down-integrate from internal code base.Feng Xiao2014-11-1045-594/+1223
|/ /
* | Merge pull request #50 from dlitz/compat-py3kFeng Xiao2014-11-081-2/+11
|\ \ | | | | | | setup.py fixes for Python 3
| * | Omit google-apputils dependency under Python 3Dwayne Litzenberger2014-10-141-1/+5
| | | | | | | | | | | | Temporary change until a py3k-compatible google-apputils is released.
| * | Use 2to3 when building under Python 3.Dwayne Litzenberger2014-10-141-1/+6
| | |
* | | Update version number to 2.6.2-pre.Feng Xiao2014-10-211-1/+1
| | |
* | | Update version number to 2.6.1.v2.6.1Feng Xiao2014-10-201-1/+1
|/ /
* / Update version number to 2.6.1rc1Feng Xiao2014-10-081-1/+1
|/
* Down-integrate from internal branch.Feng Xiao2014-10-074-6/+22
|
* Merge pull request #3 from dhirschfeld/pyext-fixFeng Xiao2014-10-021-0/+1
|\ | | | | Explicitly specify pyext/cpp_message.py in py_modules list
| * Explicitly specify pyext/cpp_message.py in py_modules listDavid Hirschfeld2014-08-271-0/+1
| |
* | Replace links to code.google.com/protobuf with ↵Feng Xiao2014-10-0169-70/+70
|/ | | | developers.google.com/protocol-buffers
* merge 2.6.0 to trunkv2.6.0jieluo@google.com2014-08-252-8/+5
|
* merge tags/2.6.0 into trunkjieluo@google.com2014-08-254-41/+33
|
* make dist complains the file name is too long and refuse to put it to tar. ↵jieluo@google.com2014-08-141-1/+1
| | | | Change the file to a shorter name
* Add deleted tests back for reflection_cpp2_test.py by addtional exception catchjieluo@google.com2014-08-141-0/+47
|
* change python README.txtjieluo@google.com2014-08-131-3/+8
|
* put python cpp tests into pyext/jieluo@google.com2014-08-135-34/+9
|
* add shared_pr.hjieluo@google.com2014-08-122-9/+10
|
* down integrate python opensource to svnjieluo@google.com2014-08-1262-962/+9928
|
* down integrate to svnjieluo@google.com2014-07-186-2262/+37
|
* Update version number in trunkxiaofeng@google.com2013-02-281-2/+1
|
* Exclude a failing test in MingW build.xiaofeng@google.com2013-02-261-1/+2
|
* Down-integrate from internal branchxiaofeng@google.com2013-02-252-2/+27
|
* Fix issue 438: add missing 'enum_type_wrapper' to setup.pyxiaofeng@google.com2012-12-081-0/+1
|
* Find the protoc from environ first for python.liujisi@google.com2012-12-051-1/+3
|
* Fix issues: 342, 424, 428, 430, 436xiaofeng@google.com2012-12-041-6/+0
|