Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | [PYTHON] Remove unnecessary `include_dir` | Tamir Duberstein | 2015-04-10 | |
| | | | ||||
* | | | [PYTHON] Clarify API version comment | Tamir Duberstein | 2015-04-10 | |
| | | | ||||
* | | | Added Python to Travis build and clarified setup instructions. | Josh Haberman | 2015-04-09 | |
| | | | ||||
* | | | Remove useless file that doesn't load | Tamir Duberstein | 2015-04-08 | |
| | | | | | | | | | | | | This file was broken in ada6556. | |||
* | | | Merge pull request #196 from Zex/master | Joshua Haberman | 2015-03-31 | |
|\ \ \ | |/ / |/| | | Fix raise and except syntax issues for py3 | |||
* | | | rename python README, and fix markdown in java and python respectively | jesse | 2015-03-16 | |
| | | | ||||
* | | | Fix python versions to comply with pep-0440. | Jisi Liu | 2015-03-04 | |
| | | | | | | | | | | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c | |||
* | | | Merge remote-tracking branch 'github/alpha-2-fix' | Jisi Liu | 2015-03-04 | |
|\ \ \ | | | | | | | | | | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e | |||
| * | | | Fix python package version to alpha-2. | Jisi Liu | 2015-03-04 | |
| | | | | | | | | | | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf | |||
* | | | | Merge pull request #225 from google/post-alpha2-integrate | Jisi Liu | 2015-03-03 | |
|\ \ \ \ | | | | | | | | | | | Post alpha2 integrate from google internal for C++ and Java | |||
* | | | | | Bump the version number to 3.0.0-alpha-3-pre | Jisi Liu | 2015-03-02 | |
| |/ / / |/| | | | | | | | | | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e | |||
| * | | | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13 | |||
* | | | Fixes for Python/C++ implementation in open-source: | Josh Haberman | 2015-02-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Liu | 2015-02-25 | |
| | | | | | | | | | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145 | |||
* | | | Update version number to 3.0.0-alpha-2 | Jisi Liu | 2015-02-21 | |
| | | | | | | | | | | | | Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2 | |||
| * | | fix raise syntax issues for py3, | zex | 2015-02-06 | |
|/ / | | | | | | | fix except syntax issue for py3 | |||
* | | Delete unused files. | Feng Xiao | 2015-01-27 | |
| | | ||||
| * | Declare explicit support for Python 3.3 and 3.4. | Tres Seaver | 2015-01-13 | |
| | | ||||
| * | Merge branch 'python-update_setup' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | |
| |\ | ||||
| * \ | Merge branch 'update-ez_setup' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | |
| |\ \ | ||||
| * | | | Test under tox: Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | |
| | | | | ||||
| * | | | Straddle Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | |
| | | | | ||||
| * | | | Don't check in derived objects. | Tres Seaver | 2015-01-13 | |
| | | | | ||||
| * | | | Compatibility with Python2.6 unittest. | Tres Seaver | 2015-01-13 | |
| | | | | ||||
| * | | | Use 'io.BytesIO' rather than 'cStringIO.StringIO'. | Tres Seaver | 2015-01-13 | |
| | | | | ||||
| * | | | Typo. | Tres Seaver | 2015-01-13 | |
| | | | | ||||
| * | | | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: python/setup.py | |||
| | * | | | Overlooked dependency. | Tres Seaver | 2015-01-13 | |
| | | | | | ||||
| * | | | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/text_format_test.py | |||
| | * | | | Drop dependency on 'google.apputils'. | Tres Seaver | 2015-01-13 | |
| |/ / / |/| | | | | | | | | | | | Use stdlib's 'unittest' instead. | |||
| * | | | Prepare for Python2-Python3 straddle. | Tres Seaver | 2015-01-13 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove PY25 cruft. - Selectively apply cleanups from 'python-modernize': - New exception syntax. - Use 'six' to handle module renames. - Use 'six' to handle text / binary stuff. This PR covers most of the work from #66 which falls inside `python` (rather than the Python code generation stuff in 'src'). | |||
| * / | Update to new canonical 'ez_setup.py'. | Tres Seaver | 2015-01-13 | |
|/ / | | | | | | | Downloaded from https://bootstrap.pypa.io/ez_setup.py. | |||
| * | Noramlize 'setup.py' to fit conventions: | Tres Seaver | 2015-01-13 | |
|/ | | | | | | | | | - Move human-centric metadata to top of 'setup()' call. - Add Trove classifiers for supported Python versions. - Use 'find_packages()' + MANIFEST.in to avoid errors in listing modules and packages. | |||
* | Merge pull request #143 from Ivoz/patch-1 | Feng Xiao | 2014-12-22 | |
|\ | | | | | Update python version / setuptools instructions | |||
* \ | Merge pull request #46 from adalq/version | Feng Xiao | 2014-12-20 | |
|\ \ | | | | | | | Add __version__ | |||
| | * | Update python version / setuptools instructions | Matt Iversen | 2014-12-17 | |
| |/ |/| | | | | | | | 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. | |||
| * | Updated __version__ | Adal Chiriliuc | 2014-12-14 | |
| | | ||||
* | | Update version number to v3.0.0-pre | Feng Xiao | 2014-12-10 | |
| | | ||||
* | | Update version number to v3.0.0-alpha-1 | Feng Xiao | 2014-12-03 | |
| | | ||||
* | | Fix Python C++ implementation build issues: | Feng Xiao | 2014-11-25 | |
| | | | | | | | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword. | |||
* | | Down-integrate from internal code base. | Feng Xiao | 2014-11-20 | |
| | | ||||
* | | Down-integrate from internal code base (C++ maps support). | Feng Xiao | 2014-11-14 | |
| | | ||||
* | | Merge branch 'typofixes-vlajos-20141108' of ↵ | Feng Xiao | 2014-11-11 | |
|\ \ | | | | | | | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc | |||
* | | | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 | |
| | | | ||||
| * | | typo fixes - https://github.com/vlajos/misspell_fixer | Veres Lajos | 2014-11-08 | |
|/ / | ||||
* | | Merge pull request #50 from dlitz/compat-py3k | Feng Xiao | 2014-11-08 | |
|\ \ | | | | | | | setup.py fixes for Python 3 | |||
* | | | Update version number to 2.6.2-pre. | Feng Xiao | 2014-10-21 | |
| | | | ||||
* | | | Update version number to 2.6.1. | Feng Xiao | 2014-10-20 | |
| | | | ||||
| * | | Omit google-apputils dependency under Python 3 | Dwayne Litzenberger | 2014-10-14 | |
| | | | | | | | | | | | | Temporary change until a py3k-compatible google-apputils is released. | |||
| * | | Use 2to3 when building under Python 3. | Dwayne Litzenberger | 2014-10-14 | |
|/ / |