AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,638 Commits 35 Branches 138 Tags 124 MiB
6e54999773
Commit Graph

168 Commits

Author SHA1 Message Date
Joshua Haberman
c7a1f8ec3b Merge pull request #728 from dano/py3_str_compat 
Get all tests passing on Python3 (except Python3.4 cpp implementation)
 2015-08-26 15:44:06 -07:00
Dan O'Reilly
38eef02aab Fix metaclass issue on Python 3. Get text handling tests passing on Python 3. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-22 13:07:12 -04:00
Dan O'Reilly
fc80874adf Start work on getting text handled properly on PY3 2015-08-22 13:07:12 -04:00
Tamir Duberstein
87993d7507 assertEquals is deprecated 2015-08-22 13:06:24 -04:00
Tamir Duberstein
821fcb2ded Use assertIsInstance 2015-08-22 12:56:34 -04:00
Tamir Duberstein
09831c8768 Clean up exception syntax 2015-08-22 12:55:19 -04:00
Tamir Duberstein
322d8939fc Remove Python 2.5 cruft 2015-08-22 12:54:31 -04:00
Dan O'Reilly
46969b99ca Set DYLD_LIBRARY_PATH for OSX 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-21 19:28:18 -04:00
Dan O'Reilly
3791c8051a Fix travis build 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 20:49:45 -04:00
Dan O'Reilly
5de2a81b01 Improve tox.ini, install py26 for travis. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 18:19:56 -04:00
Dan O'Reilly
afa488c4d1 Remove debug code 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 15:51:06 -04:00
Dan O'Reilly
416f001adc Use tox in travis build. Tweak tox.ini 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 15:29:10 -04:00
Dan O'Reilly
3bdfb4b695 Add some clarifying comments. Remove ez_setup.py. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-20 13:52:19 -04:00
Dan O'Reilly
9d689692d3 Make testing cpp implementation optional 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-16 13:56:25 -04:00
Dan O'Reilly
3083d8cee7 Fix --cpp_implementation test failure. Test both pure Python and cpp implementation in tox. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-15 10:07:38 -04:00
Dan O'Reilly
7601551f7c Just always uses BytseIO in text_format for now 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 23:22:47 -04:00
Dan O'Reilly
7013a75b90 Disable py3* in tox 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 23:09:29 -04:00
Dan O'Reilly
2621c8aefb Get Python 2.6 working. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 22:54:53 -04:00
Dan O'Reilly
d06adbd4a4 Fix usage of assertItemsEqual on Py3 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 16:16:00 -04:00
Dan O'Reilly
3d5aa6aef9 Fix some more Python 3 compat issues 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 16:12:34 -04:00
Dan O'Reilly
fe7d9379df Fixing some long/int bugs 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 15:26:33 -04:00
Dan O'Reilly
981d6bf2f7 Build protobuf files in as part of tox runs. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-13 01:24:05 -04:00
Dan O'Reilly
833c046fb7 Fixing some tests 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-13 01:17:26 -04:00
Dan O'Reilly
e47cdd5a55 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 
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
 2015-08-12 23:57:46 -04:00
Bo Yang
9f563bd0d8 Internal local modifications. 2015-07-09 12:39:52 -07:00
Bo Yang
e107e2d68e Update version number to 3.0.0-alpha-4 2015-05-29 11:00:57 -07:00
Feng Xiao
8e1426800e Replace the check of "../.git" 
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.
 2015-05-26 00:11:09 -07:00
teboring
9839c0c2c9 Update version number to 3.0.0-alpha-3 2015-05-23 09:20:23 -07:00
Bo Yang
5db217305f down-integrate internal changes 2015-05-21 19:32:02 -07:00
Tamir Duberstein
e4f4d9fe83 Only generate protos in development 
Fixes #333.
 2015-05-15 17:53:00 -04:00
Tamir Duberstein
5018c433ed Use glob to simplify 2015-05-15 17:41:04 -04:00
Joshua Haberman
cd141089a1 Merge pull request #255 from btabibian/master 
adding globals() to exec call for python3 compatibility
 2015-05-07 21:45:15 -07:00
Behzad Tabibian
2bf92b3be9 mend 2015-05-07 19:04:56 +02:00
Tamir Duberstein
21a7cf965a Noramlize 'setup.py' to fit conventions: 
- 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.
 2015-05-06 17:02:57 -04:00
Tamir Duberstein
4f5cbe6ead Whitespace 2015-05-06 17:02:57 -04:00
Tamir Duberstein
9d9d0b70de Don't hard-code the python path 2015-05-06 17:02:57 -04:00
Behzad Tabibian
4b4770280d adding globals() to exec call for python3 compatibility 2015-04-28 11:09:05 +02:00
Tamir Duberstein
9f42f5f4a4 [PYTHON] Drop dependency on 'google.apputils'. 
Use stdlib's 'unittest' instead.
 2015-04-10 19:43:51 -04:00
Tamir Duberstein
dab96f19ee [PYTHON] Remove awkward duplicate tests 
We already run all tests with and without `--cpp_implementation`
 2015-04-10 19:43:50 -04:00
Tamir Duberstein
d632bc76f1 [PYTHON] README: explain homebrew shenanigans 2015-04-10 15:42:23 -04:00
Tamir Duberstein
a46a2e9422 [PYTHON] Remove unnecessary include_dir 2015-04-10 15:15:53 -04:00
Tamir Duberstein
ef1b747a42 [PYTHON] Clarify API version comment 2015-04-10 09:46:21 -04:00
Josh Haberman
2bd813b1b5 Added Python to Travis build and clarified setup instructions. 2015-04-09 16:41:58 -07:00
Tamir Duberstein
8ede2817a0 Remove useless file that doesn't load 
This file was broken in ada6556.
 2015-04-08 18:33:04 -04:00
Joshua Haberman
42809ef8fe Merge pull request #196 from Zex/master 
Fix raise and except syntax issues for py3
 2015-03-31 12:30:17 -07:00
jesse
cd04e9b702 rename python README, and fix markdown in java and python respectively 2015-03-16 15:15:59 -07:00
Jisi Liu
4573e110b8 Fix python versions to comply with pep-0440. 
Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c
 2015-03-04 16:45:13 -08:00
Jisi Liu
e4a9ace541 Merge remote-tracking branch 'github/alpha-2-fix' 
Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e
 2015-03-04 15:37:21 -08:00
Jisi Liu
8e61d323bf Fix python package version to alpha-2. 
Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf
 2015-03-04 15:28:35 -08:00
Jisi Liu
ed3c8a11f9 Merge pull request #225 from google/post-alpha2-integrate 
Post alpha2 integrate from google internal for C++ and Java
 2015-03-03 17:51:05 -08:00