Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove debug code | Dan O'Reilly | 2015-08-20 | 1 | -1/+0 |
| | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
* | Use tox in travis build. Tweak tox.ini | Dan O'Reilly | 2015-08-20 | 1 | -0/+1 |
| | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
* | Add some clarifying comments. Remove ez_setup.py. | Dan O'Reilly | 2015-08-20 | 1 | -13/+1 |
| | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
* | Get Python 2.6 working. | Dan O'Reilly | 2015-08-14 | 1 | -1/+6 |
| | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
* | Fixing some tests | Dan O'Reilly | 2015-08-13 | 1 | -35/+22 |
| | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
* | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-12 | 1 | -54/+73 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/google/protobuf/descriptor_pool.py python/google/protobuf/internal/api_implementation_default_test.py python/google/protobuf/internal/cpp_message.py python/google/protobuf/internal/descriptor_database_test.py python/google/protobuf/internal/descriptor_pool_test.py python/google/protobuf/internal/descriptor_python_test.py python/google/protobuf/internal/descriptor_test.py python/google/protobuf/internal/generator_test.py python/google/protobuf/internal/message_factory_python_test.py python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/message_test.py python/google/protobuf/internal/proto_builder_test.py python/google/protobuf/internal/python_message.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/service_reflection_test.py python/google/protobuf/internal/symbol_database_test.py python/google/protobuf/internal/text_encoding_test.py python/google/protobuf/internal/text_format_test.py python/google/protobuf/internal/unknown_fields_test.py python/google/protobuf/internal/wire_format_test.py python/google/protobuf/pyext/descriptor_cpp2_test.py python/google/protobuf/pyext/message_factory_cpp2_test.py python/google/protobuf/pyext/reflection_cpp2_generated_test.py python/setup.py ruby/lib/google/protobuf/message_exts.rb | ||||
| * | Replace the check of "../.git" | Feng Xiao | 2015-05-26 | 1 | -25/+24 |
| | | | | | | | | | | | | | | Checking the existence of ".git" is not the right way to check whether we are in develop environment because we distribute source tar-balls where such a ".git" directory does not exist. Replaced it with checking .proto files. | ||||
| * | down-integrate internal changes | Bo Yang | 2015-05-21 | 1 | -0/+1 |
| | | |||||
| * | Only generate protos in development | Tamir Duberstein | 2015-05-15 | 1 | -0/+4 |
| | | | | | | | | Fixes #333. | ||||
| * | Use glob to simplify | Tamir Duberstein | 2015-05-15 | 1 | -10/+3 |
| | | |||||
| * | Merge pull request #255 from btabibian/master | Joshua Haberman | 2015-05-07 | 1 | -1/+1 |
| |\ | | | | | | | adding globals() to exec call for python3 compatibility | ||||
| | * | mend | Behzad Tabibian | 2015-05-07 | 1 | -1/+1 |
| | | | |||||
| | * | adding globals() to exec call for python3 compatibility | Behzad Tabibian | 2015-04-28 | 1 | -1/+1 |
| | | | |||||
| * | | Noramlize 'setup.py' to fit conventions: | Tamir Duberstein | 2015-05-06 | 1 | -86/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Comply with flake8, except for indentation width, which is 2. - 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. Closes #131 and #161. | ||||
| * | | Don't hard-code the python path | Tamir Duberstein | 2015-05-06 | 1 | -1/+1 |
| | | | |||||
| * | | [PYTHON] Drop dependency on 'google.apputils'. | Tamir Duberstein | 2015-04-10 | 1 | -6/+1 |
| | | | | | | | | | | | | Use stdlib's 'unittest' instead. | ||||
| * | | [PYTHON] Remove unnecessary `include_dir` | Tamir Duberstein | 2015-04-10 | 1 | -1/+1 |
| | | | |||||
| * | | Remove useless file that doesn't load | Tamir Duberstein | 2015-04-08 | 1 | -1/+0 |
| |/ | | | | | | | This file was broken in ada6556. | ||||
| * | Fix python versions to comply with pep-0440. | Jisi Liu | 2015-03-04 | 1 | -1/+13 |
| | | | | | | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c | ||||
| * | Bump the version number to 3.0.0-alpha-3-pre | Jisi Liu | 2015-03-02 | 1 | -1/+1 |
| | | | | | | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e | ||||
| * | Down integrate from Google internal. | Jisi Liu | 2015-02-25 | 1 | -18/+4 |
| | | | | | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145 | ||||
| * | Update version number to 3.0.0-alpha-2 | Jisi Liu | 2015-02-21 | 1 | -1/+1 |
| | | | | | | | | Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2 | ||||
* | | Declare explicit support for Python 3.3 and 3.4. | Tres Seaver | 2015-01-13 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'python-update_setup' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 1 | -37/+18 |
|\ \ | |||||
| * | | Noramlize 'setup.py' to fit conventions: | Tres Seaver | 2015-01-13 | 1 | -37/+18 |
| |/ | | | | | | | | | | | | | | | | | - 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. | ||||
* | | Compatibility with Python2.6 unittest. | Tres Seaver | 2015-01-13 | 1 | -7/+0 |
| | | |||||
* | | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Conflicts: python/setup.py | ||||
| * | | Overlooked dependency. | Tres Seaver | 2015-01-13 | 1 | -1/+1 |
| |/ | |||||
* / | Drop dependency on 'google.apputils'. | Tres Seaver | 2015-01-13 | 1 | -5/+0 |
|/ | | | | Use stdlib's 'unittest' instead. | ||||
* | Update version number to v3.0.0-pre | Feng Xiao | 2014-12-10 | 1 | -1/+1 |
| | |||||
* | Update version number to v3.0.0-alpha-1 | Feng Xiao | 2014-12-03 | 1 | -1/+1 |
| | |||||
* | Fix Python C++ implementation build issues: | Feng Xiao | 2014-11-25 | 1 | -1/+1 |
| | | | | | 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-10 | 1 | -0/+3 |
| | |||||
* | Merge pull request #50 from dlitz/compat-py3k | Feng Xiao | 2014-11-08 | 1 | -2/+11 |
|\ | | | | | setup.py fixes for Python 3 | ||||
| * | Omit google-apputils dependency under Python 3 | Dwayne Litzenberger | 2014-10-14 | 1 | -1/+5 |
| | | | | | | | | Temporary change until a py3k-compatible google-apputils is released. | ||||
| * | Use 2to3 when building under Python 3. | Dwayne Litzenberger | 2014-10-14 | 1 | -1/+6 |
| | | |||||
* | | Update version number to 2.6.2-pre. | Feng Xiao | 2014-10-21 | 1 | -1/+1 |
| | | |||||
* | | Update version number to 2.6.1.v2.6.1 | Feng Xiao | 2014-10-20 | 1 | -1/+1 |
|/ | |||||
* | Update version number to 2.6.1rc1 | Feng Xiao | 2014-10-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3 from dhirschfeld/pyext-fix | Feng Xiao | 2014-10-02 | 1 | -0/+1 |
|\ | | | | | Explicitly specify pyext/cpp_message.py in py_modules list | ||||
| * | Explicitly specify pyext/cpp_message.py in py_modules list | David Hirschfeld | 2014-08-27 | 1 | -0/+1 |
| | | |||||
* | | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 | 1 | -1/+1 |
|/ | | | | developers.google.com/protocol-buffers | ||||
* | merge 2.6.0 to trunkv2.6.0 | jieluo@google.com | 2014-08-25 | 1 | -3/+2 |
| | |||||
* | merge tags/2.6.0 into trunk | jieluo@google.com | 2014-08-25 | 1 | -14/+28 |
| | |||||
* | put python cpp tests into pyext/ | jieluo@google.com | 2014-08-13 | 1 | -8/+9 |
| | |||||
* | add shared_pr.h | jieluo@google.com | 2014-08-12 | 1 | -8/+10 |
| | |||||
* | down integrate python opensource to svn | jieluo@google.com | 2014-08-12 | 1 | -98/+51 |
| | |||||
* | down integrate to svn | jieluo@google.com | 2014-07-18 | 1 | -1/+37 |
| | |||||
* | Update version number in trunk | xiaofeng@google.com | 2013-02-28 | 1 | -2/+1 |
| | |||||
* | Fix issue 438: add missing 'enum_type_wrapper' to setup.py | xiaofeng@google.com | 2012-12-08 | 1 | -0/+1 |
| |