Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Update to new canonical 'ez_setup.py'. | Tres Seaver | 2015-01-13 | 1 | -244/+292 | |
| | |/ / | | | | | | | | | | | | | Downloaded from https://bootstrap.pypa.io/ez_setup.py. | |||||
| * | | | Test under tox: Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | 1 | -0/+13 | |
| | | | | ||||||
| * | | | Straddle Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | 10 | -123/+123 | |
| | | | | ||||||
| * | | | Don't check in derived objects. | Tres Seaver | 2015-01-13 | 2 | -0/+0 | |
| | | | | ||||||
| * | | | Compatibility with Python2.6 unittest. | Tres Seaver | 2015-01-13 | 4 | -21/+35 | |
| | | | | ||||||
| * | | | Use 'io.BytesIO' rather than 'cStringIO.StringIO'. | Tres Seaver | 2015-01-13 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | Typo. | Tres Seaver | 2015-01-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | 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 | |
| | | | | | ||||||
| * | | | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 24 | -96/+100 | |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | 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 | 22 | -96/+100 | |
| | |/ / | | | | | | | | | | | | | Use stdlib's 'unittest' instead. | |||||
| * / / | Prepare for Python2-Python3 straddle. | Tres Seaver | 2015-01-13 | 15 | -198/+144 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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'). | |||||
* | | | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | 3 | -28/+99 | |
| | | | ||||||
* | | | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 23 | -665/+969 | |
| | | | ||||||
* | | | Down-integrate from internal branch. | Jisi Liu | 2015-08-21 | 3 | -0/+72 | |
| |/ |/| | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | |||||
* | | Internal local modifications. | Bo Yang | 2015-07-09 | 1 | -0/+7 | |
| | | ||||||
* | | Update version number to 3.0.0-alpha-4 | Bo Yang | 2015-05-29 | 1 | -1/+1 | |
| | | ||||||
* | | 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. | |||||
* | | Update version number to 3.0.0-alpha-3 | teboring | 2015-05-23 | 1 | -1/+1 | |
| | | ||||||
* | | down-integrate internal changes | Bo Yang | 2015-05-21 | 42 | -544/+3282 | |
| | | ||||||
* | | 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 | 2 | -86/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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. | |||||
* | | | Whitespace | Tamir Duberstein | 2015-05-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | Don't hard-code the python path | Tamir Duberstein | 2015-05-06 | 16 | -16/+16 | |
| | | | ||||||
* | | | [PYTHON] Drop dependency on 'google.apputils'. | Tamir Duberstein | 2015-04-10 | 17 | -97/+97 | |
| | | | | | | | | | | | | Use stdlib's 'unittest' instead. | |||||
* | | | [PYTHON] Remove awkward duplicate tests | Tamir Duberstein | 2015-04-10 | 3 | -162/+0 | |
| | | | | | | | | | | | | We already run all tests with and without `--cpp_implementation` | |||||
* | | | [PYTHON] README: explain homebrew shenanigans | Tamir Duberstein | 2015-04-10 | 1 | -8/+26 | |
| | | | ||||||
* | | | [PYTHON] Remove unnecessary `include_dir` | Tamir Duberstein | 2015-04-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | [PYTHON] Clarify API version comment | Tamir Duberstein | 2015-04-10 | 1 | -2/+2 | |
| | | | ||||||
* | | | Added Python to Travis build and clarified setup instructions. | Josh Haberman | 2015-04-09 | 1 | -10/+16 | |
| | | | ||||||
* | | | Remove useless file that doesn't load | Tamir Duberstein | 2015-04-08 | 2 | -664/+0 | |
| | | | | | | | | | | | | This file was broken in ada6556. | |||||
* | | | Merge pull request #196 from Zex/master | Joshua Haberman | 2015-03-31 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | Fix raise and except syntax issues for py3 | |||||
| * | | fix raise syntax issues for py3, | zex | 2015-02-06 | 1 | -2/+2 | |
| | | | | | | | | | | | | fix except syntax issue for py3 | |||||
* | | | rename python README, and fix markdown in java and python respectively | jesse | 2015-03-16 | 1 | -6/+11 | |
| | | | ||||||
* | | | Fix python versions to comply with pep-0440. | Jisi Liu | 2015-03-04 | 2 | -2/+14 | |
| | | | | | | | | | | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c | |||||
* | | | Merge remote-tracking branch 'github/alpha-2-fix' | Jisi Liu | 2015-03-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e | |||||
| * | | | Fix python package version to alpha-2. | Jisi Liu | 2015-03-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf | |||||
* | | | | Merge pull request #225 from google/post-alpha2-integrate | Jisi Liu | 2015-03-03 | 6 | -15/+22 | |
|\ \ \ \ | | | | | | | | | | | Post alpha2 integrate from google internal for C++ and Java | |||||
| * | | | | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 6 | -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-pre | Jisi Liu | 2015-03-02 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e | |||||
* | | | Fixes for Python/C++ implementation in open-source: | Josh Haberman | 2015-02-25 | 9 | -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 Liu | 2015-02-25 | 36 | -2077/+5690 | |
| | | | | | | | | | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145 | |||||
* | | | Update version number to 3.0.0-alpha-2 | Jisi Liu | 2015-02-21 | 1 | -1/+1 | |
|/ / | | | | | | | Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2 | |||||
* / | Delete unused files. | Feng Xiao | 2015-01-27 | 1 | -27/+0 | |
|/ | ||||||
* | Merge pull request #143 from Ivoz/patch-1 | Feng Xiao | 2014-12-22 | 1 | -2/+2 | |
|\ | | | | | Update python version / setuptools instructions | |||||
| * | Update python version / setuptools instructions | Matt Iversen | 2014-12-17 | 1 | -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. |