aboutsummaryrefslogtreecommitdiff
path: root/python
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Compatibility with Python2.6 unittest.Tres Seaver2015-01-134-21/+35
| | | |
| * | | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-132-3/+3
| | | |
| * | | Typo.Tres Seaver2015-01-131-1/+1
| | | |
| * | | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3Tres Seaver2015-01-131-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: python/setup.py
| | * | | Overlooked dependency.Tres Seaver2015-01-131-1/+1
| | | | |
| * | | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1324-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 Seaver2015-01-1322-96/+100
| | |/ / | | | | | | | | | | | | Use stdlib's 'unittest' instead.
| * / / Prepare for Python2-Python3 straddle.Tres Seaver2015-01-1315-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 Xiao2015-08-233-28/+99
| | |
* | | Down-integrate from google3.Feng Xiao2015-08-2223-665/+969
| | |
* | | Down-integrate from internal branch.Jisi Liu2015-08-213-0/+72
| |/ |/| | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
* | Internal local modifications.Bo Yang2015-07-091-0/+7
| |
* | Update version number to 3.0.0-alpha-4Bo Yang2015-05-291-1/+1
| |
* | Replace the check of "../.git"Feng Xiao2015-05-261-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-3teboring2015-05-231-1/+1
| |
* | down-integrate internal changesBo Yang2015-05-2142-544/+3282
| |
* | Only generate protos in developmentTamir Duberstein2015-05-151-0/+4
| | | | | | | | Fixes #333.
* | Use glob to simplifyTamir Duberstein2015-05-151-10/+3
| |
* | Merge pull request #255 from btabibian/masterJoshua Haberman2015-05-071-1/+1
|\ \ | | | | | | adding globals() to exec call for python3 compatibility
| * | mendBehzad Tabibian2015-05-071-1/+1
| | |
| * | adding globals() to exec call for python3 compatibilityBehzad Tabibian2015-04-281-1/+1
| | |
* | | Noramlize 'setup.py' to fit conventions:Tamir Duberstein2015-05-062-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.
* | | WhitespaceTamir Duberstein2015-05-061-1/+1
| | |
* | | Don't hard-code the python pathTamir Duberstein2015-05-0616-16/+16
| | |
* | | [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-1017-97/+97
| | | | | | | | | | | | Use stdlib's 'unittest' instead.
* | | [PYTHON] Remove awkward duplicate testsTamir Duberstein2015-04-103-162/+0
| | | | | | | | | | | | We already run all tests with and without `--cpp_implementation`
* | | [PYTHON] README: explain homebrew shenanigansTamir Duberstein2015-04-101-8/+26
| | |
* | | [PYTHON] Remove unnecessary `include_dir`Tamir Duberstein2015-04-101-1/+1
| | |
* | | [PYTHON] Clarify API version commentTamir Duberstein2015-04-101-2/+2
| | |
* | | Added Python to Travis build and clarified setup instructions.Josh Haberman2015-04-091-10/+16
| | |
* | | Remove useless file that doesn't loadTamir Duberstein2015-04-082-664/+0
| | | | | | | | | | | | This file was broken in ada6556.
* | | Merge pull request #196 from Zex/masterJoshua Haberman2015-03-311-2/+2
|\ \ \ | |/ / |/| | Fix raise and except syntax issues for py3
| * | fix raise syntax issues for py3,zex2015-02-061-2/+2
| | | | | | | | | | | | fix except syntax issue for py3
* | | rename python README, and fix markdown in java and python respectivelyjesse2015-03-161-6/+11
| | |
* | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 04:35:45 +0000