aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove extraneous TODOJon Skeet2015-08-251-1/+0
* Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-255-123/+122
* Merge pull request #711 from tamird/python3-prepJoshua Haberman2015-08-226-41/+25
|\
| * assertEquals is deprecatedTamir Duberstein2015-08-221-4/+4
| * Use assertIsInstanceTamir Duberstein2015-08-223-17/+13
| * Clean up exception syntaxTamir Duberstein2015-08-221-2/+0
| * Remove Python 2.5 cruftTamir Duberstein2015-08-222-18/+8
|/
* Merge pull request #722 from dano/py2_py3_straddleJoshua Haberman2015-08-2231-728/+448
|\
| * Set DYLD_LIBRARY_PATH for OSXDan O'Reilly2015-08-211-0/+1
| * Travis now only tests Python2.6 on Linux.Dan O'Reilly2015-08-211-6/+21
| * Fix travis buildDan O'Reilly2015-08-202-0/+3
| * Improve tox.ini, install py26 for travis.Dan O'Reilly2015-08-202-12/+24
| * Remove debug codeDan O'Reilly2015-08-201-1/+0
| * Install tox during travis build.Dan O'Reilly2015-08-201-0/+2
| * Remove ez_setup.py from Makefile.amDan O'Reilly2015-08-201-1/+0
| * Use tox in travis build. Tweak tox.iniDan O'Reilly2015-08-203-10/+6
| * Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_stra...Dan O'Reilly2015-08-201-1/+0
| |\
| | * Fix duplicate entry in .gitignoreDan O'Reilly2015-08-181-1/+0
| * | Add some clarifying comments. Remove ez_setup.py.Dan O'Reilly2015-08-204-345/+5
| |/
| * Make testing cpp implementation optionalDan O'Reilly2015-08-161-2/+1
| * Fix --cpp_implementation test failure. Test both pure Python and cpp implemen...Dan O'Reilly2015-08-152-8/+9
| * Just always uses BytseIO in text_format for nowDan O'Reilly2015-08-141-4/+1
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1410-244/+471
| |\
| * | Disable py3* in toxDan O'Reilly2015-08-141-1/+2
| * | Get Python 2.6 working.Dan O'Reilly2015-08-1417-69/+104
| * | Fix usage of assertItemsEqual on Py3Dan O'Reilly2015-08-141-2/+2
| * | Fix some more Python 3 compat issuesDan O'Reilly2015-08-143-14/+25
| * | Fixing some long/int bugsDan O'Reilly2015-08-144-12/+21
| * | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1411-125/+470
| |\ \
| * | | Build protobuf files in as part of tox runs.Dan O'Reilly2015-08-131-0/+1
| * | | Fixing some testsDan O'Reilly2015-08-134-42/+30
| * | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-12930-21697/+246414
| |\ \ \
| * | | | Declare explicit support for Python 3.3 and 3.4.Tres Seaver2015-01-131-0/+4
| * | | | Merge branch 'python-update_setup' into straddle_py2_py3Tres Seaver2015-01-132-37/+32
| |\ \ \ \
| | * | | | Noramlize 'setup.py' to fit conventions:Tres Seaver2015-01-132-37/+32
| * | | | | Merge branch 'update-ez_setup' into straddle_py2_py3Tres Seaver2015-01-131-244/+292
| |\ \ \ \ \
| | * | | | | Update to new canonical 'ez_setup.py'.Tres Seaver2015-01-131-244/+292
| | |/ / / /
| * | | | | Test under tox: Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-0/+13
| * | | | | Ignore more derived files.Tres Seaver2015-01-131-1/+2
| * | | | | Merge branch 'ignore_so_libs' into straddle_py2_py3Tres Seaver2015-01-131-0/+1
| |\ \ \ \ \
| | * | | | | Ignore .so files.Tres Seaver2015-01-131-0/+1
| | |/ / / /
| * | | | | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-1310-123/+123
| * | | | | Don't check in derived objects.Tres Seaver2015-01-132-0/+0
| * | | | | 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
| |\ \ \ \ \
| | * | | | | Overlooked dependency.Tres Seaver2015-01-131-1/+1
| * | | | | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1324-96/+100
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Drop dependency on 'google.apputils'.Tres Seaver2015-01-1322-96/+100
| | |/ / / /