Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-25 | 29 | -741/+432 |
|\ | |||||
| * | assertEquals is deprecated | Tamir Duberstein | 2015-08-22 | 1 | -4/+4 |
| * | Use assertIsInstance | Tamir Duberstein | 2015-08-22 | 3 | -17/+13 |
| * | Clean up exception syntax | Tamir Duberstein | 2015-08-22 | 1 | -2/+0 |
| * | Remove Python 2.5 cruft | Tamir Duberstein | 2015-08-22 | 1 | -4/+2 |
| * | Set DYLD_LIBRARY_PATH for OSX | Dan O'Reilly | 2015-08-21 | 1 | -0/+1 |
| * | Fix travis build | Dan O'Reilly | 2015-08-20 | 2 | -0/+3 |
| * | Improve tox.ini, install py26 for travis. | Dan O'Reilly | 2015-08-20 | 1 | -7/+10 |
| * | Remove debug code | Dan O'Reilly | 2015-08-20 | 1 | -1/+0 |
| * | Use tox in travis build. Tweak tox.ini | Dan O'Reilly | 2015-08-20 | 2 | -2/+4 |
| * | Add some clarifying comments. Remove ez_setup.py. | Dan O'Reilly | 2015-08-20 | 4 | -345/+5 |
| * | Make testing cpp implementation optional | Dan O'Reilly | 2015-08-16 | 1 | -2/+1 |
| * | Fix --cpp_implementation test failure. Test both pure Python and cpp implemen... | Dan O'Reilly | 2015-08-15 | 2 | -8/+9 |
| * | Just always uses BytseIO in text_format for now | Dan O'Reilly | 2015-08-14 | 1 | -4/+1 |
| * | Disable py3* in tox | Dan O'Reilly | 2015-08-14 | 1 | -1/+2 |
| * | Get Python 2.6 working. | Dan O'Reilly | 2015-08-14 | 17 | -69/+104 |
| * | Fix usage of assertItemsEqual on Py3 | Dan O'Reilly | 2015-08-14 | 1 | -2/+2 |
| * | Fix some more Python 3 compat issues | Dan O'Reilly | 2015-08-14 | 3 | -14/+25 |
| * | Fixing some long/int bugs | Dan O'Reilly | 2015-08-14 | 4 | -12/+21 |
| * | Build protobuf files in as part of tox runs. | Dan O'Reilly | 2015-08-13 | 1 | -0/+1 |
| * | Fixing some tests | Dan O'Reilly | 2015-08-13 | 4 | -42/+30 |
| * | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-12 | 59 | -3198/+9181 |
| |\ | |||||
| * | | 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 | 2 | -37/+32 |
| |\ \ | |||||
| | * | | Noramlize 'setup.py' to fit conventions: | Tres Seaver | 2015-01-13 | 2 | -37/+32 |
| * | | | Merge branch 'update-ez_setup' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 1 | -244/+292 |
| |\ \ \ | |||||
| | * | | | Update to new canonical 'ez_setup.py'. | Tres Seaver | 2015-01-13 | 1 | -244/+292 |
| | |/ / | |||||
| * | | | 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 |
| |\ \ \ | |||||
| | * | | | 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 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Drop dependency on 'google.apputils'. | Tres Seaver | 2015-01-13 | 22 | -96/+100 |
| | |/ / | |||||
| * / / | Prepare for Python2-Python3 straddle. | Tres Seaver | 2015-01-13 | 15 | -198/+144 |
| |/ / | |||||
* | | | 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 |
| |/ |/| | |||||
* | | 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 |
* | | 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 |
* | | 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 |
|\ \ | |||||
| * | | mend | Behzad Tabibian | 2015-05-07 | 1 | -1/+1 |