Commits · 821fcb2ded668a688316b66fcd5ff28e868298e7 · submodule / protobuf

22 Aug, 2015 4 commits
- Use assertIsInstance · 821fcb2d
  Tamir Duberstein authored Aug 12, 2015
  
  821fcb2d
- Clean up exception syntax · 09831c87
  Tamir Duberstein authored Aug 12, 2015
  
  09831c87
- Remove Python 2.5 cruft · 322d8939
  Tamir Duberstein authored Aug 12, 2015
  
  322d8939
- Merge pull request #722 from dano/py2_py3_straddle · 3ff56252
  Joshua Haberman authored Aug 22, 2015
```
Add tox, Python 2.6 compatibility, and many Python 3 compatibility fixes
```
  3ff56252
21 Aug, 2015 4 commits
- Set DYLD_LIBRARY_PATH for OSX · 46969b99
  Dan O'Reilly authored Aug 21, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  46969b99
- Travis now only tests Python2.6 on Linux. · 76f8a3fb
  Dan O'Reilly authored Aug 21, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  76f8a3fb
- Merge pull request #584 from haberman/cwarnings · eb65c69e
  Joshua Haberman authored Aug 21, 2015
```
Ruby: Conform to C89/C90 variable declaration rules.
```
  eb65c69e
- Fix travis build · 3791c805
  Dan O'Reilly authored Aug 21, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  3791c805
20 Aug, 2015 8 commits
- Return TypedData_Wrap_Struct directly. · d61e6adf
  Josh Haberman authored Aug 20, 2015
```
Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
```
  d61e6adf
- Improve tox.ini, install py26 for travis. · 5de2a81b
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  5de2a81b
- Remove debug code · afa488c4
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  afa488c4
- Install tox during travis build. · 5029c7b7
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  5029c7b7
- Remove ez_setup.py from Makefile.am · 4a0129f6
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  4a0129f6
- Use tox in travis build. Tweak tox.ini · 416f001a
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  416f001a
- Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle · de22561b
  Dan O'Reilly authored Aug 20, 2015
  
  de22561b
- Add some clarifying comments. Remove ez_setup.py. · 3bdfb4b6
  Dan O'Reilly authored Aug 20, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  3bdfb4b6
18 Aug, 2015 1 commit
- Fix duplicate entry in .gitignore · 4fefc07e
  Dan O'Reilly authored Aug 18, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  4fefc07e
16 Aug, 2015 1 commit
- Make testing cpp implementation optional · 9d689692
  Dan O'Reilly authored Aug 16, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  9d689692
15 Aug, 2015 5 commits
- Fix --cpp_implementation test failure. Test both pure Python and cpp implementation in tox. · 3083d8ce
  Dan O'Reilly authored Aug 15, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  3083d8ce
- Just always uses BytseIO in text_format for now · 7601551f
  Dan O'Reilly authored Aug 15, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  7601551f
- Merge remote-tracking branch 'upstream/master' into py2_py3_straddle · 893b65e4
  Dan O'Reilly authored Aug 15, 2015
  
  893b65e4
- Disable py3* in tox · 7013a75b
  Dan O'Reilly authored Aug 15, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  7013a75b
- Get Python 2.6 working. · 2621c8ae
  Dan O'Reilly authored Aug 15, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  2621c8ae
14 Aug, 2015 10 commits
- Merge pull request #720 from jtattermusch/csharp_fixes · 0cb84ee3
  Jon Skeet authored Aug 14, 2015
```
C# fix for TypeInitializer exception.
```
  0cb84ee3
- fix type initialization problem with FileDescriptor · fa2fe35d
  Jan Tattermusch authored Aug 14, 2015
  
  fa2fe35d
- add a failing descriptor test · 143688f6
  Jan Tattermusch authored Aug 14, 2015
  
  143688f6
- remove duplicate test case · a55a4449
  Jan Tattermusch authored Aug 14, 2015
  
  a55a4449
- Fix usage of assertItemsEqual on Py3 · d06adbd4
  Dan O'Reilly authored Aug 14, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  d06adbd4
- Fix some more Python 3 compat issues · 3d5aa6ae
  Dan O'Reilly authored Aug 14, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  3d5aa6ae
- Merge pull request #571 from thomasvl/validation_support · 5c370cc5
  Paul Yang authored Aug 14, 2015
```
Add support for a file listing expected package to objc prefixes for validation.
```
  5c370cc5
- Fixing some long/int bugs · fe7d9379
  Dan O'Reilly authored Aug 14, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
  fe7d9379
- Merge remote-tracking branch 'upstream/master' into py2_py3_straddle · 6654e77f
  Dan O'Reilly authored Aug 14, 2015
  
  6654e77f
- Add support for a file listing expected package to objc prefixes for validation. · 4e43931e
  Thomas Van Lenten authored Jul 06, 2015
```
- Add a env var to pass a set of expected prefixes for validation.
- Report warnings/errors based on the expected prefixes vs. the data in the files compiled.
- Use some helpers from common directory.
```
  4e43931e
13 Aug, 2015 7 commits

Merge pull request #716 from haberman/fixruby · 53435df5
Joshua Haberman authored Aug 13, 2015
```
Fixed several Ruby conformance test cases through upb update.
```
53435df5
Merge pull request #718 from jskeet/descriptor-descriptor · 2093749c
Jan Tattermusch authored Aug 13, 2015
```
Allow public access to descriptor.proto as a dependency.
```
2093749c

Allow public access to descriptor.proto as a dependency. · a39ababb

Jon Skeet authored Aug 13, 2015

With this in place, generating APIs on github.com/google/googleapis works - previously annotations.proto failed.
Currently there's no access to the annotations (stored as extensions) but we could potentially expose those at a later date.

a39ababb

Merge pull request #673 from podsvirov/topic-cmake-install · f818183f
Feng Xiao authored Aug 13, 2015
```
Install protobuf from cmake project
```
f818183f
Build protobuf files in as part of tox runs. · 981d6bf2
Dan O'Reilly authored Aug 13, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
981d6bf2
Fixing some tests · 833c046f
Dan O'Reilly authored Aug 13, 2015
```
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
```
833c046f

Merge remote-tracking branch 'upstream/master' into py2_py3_straddle · e47cdd5a

Dan O'Reilly authored Aug 13, 2015

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

e47cdd5a