AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,219 Commits 35 Branches 138 Tags 124 MiB
cc775f7ac1
Commit Graph

210 Commits

Author SHA1 Message Date
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
Jisi Liu
40f2df3c16 Bump the version number to 3.0.0-alpha-3-pre 
Change-Id: I33479e529b060e4fed532a827a386d3baecc835e
 2015-03-02 19:31:31 -08:00
Jisi Liu
885b612f74 Down integrate from Google internal branch for C++ and Java. 
- Maps for C++ lite
- C++ Arena optimizations.
- Java Lite runtime code size optimization.

Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
 2015-02-28 17:06:49 -08:00
Josh Haberman
0b70a43736 Fixes for Python/C++ implementation in open-source: 
* 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.
 2015-02-25 20:17:32 -08:00
Jisi Liu
ada6556785 Down integrate from Google internal. 
Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
 2015-02-25 16:39:11 -08:00
Jisi Liu
7d8564f220 Update version number to 3.0.0-alpha-2 
Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2
 2015-02-21 13:55:43 -08:00
zex
a4f634ce74 fix raise syntax issues for py3, 
fix except syntax issue for py3
 2015-02-06 13:51:49 +08:00
Feng Xiao
ae11803d77 Delete unused files. 2015-01-27 11:17:18 -08:00
Tres Seaver
daeaa6a28b Declare explicit support for Python 3.3 and 3.4. 2015-01-13 16:00:33 -05:00
Tres Seaver
11de419773 Merge branch 'python-update_setup' into straddle_py2_py3 2015-01-13 15:59:09 -05:00
Tres Seaver
c0f673d0dc Merge branch 'update-ez_setup' into straddle_py2_py3 2015-01-13 15:58:47 -05:00
Tres Seaver
f1eae1a168 Test under tox: Python 2.6, 2.7, 3.3, 3.4. 2015-01-13 15:58:31 -05:00
Tres Seaver
a2abc947c0 Straddle Python 2.6, 2.7, 3.3, 3.4. 2015-01-13 15:47:55 -05:00
Tres Seaver
3d5460dd90 Don't check in derived objects. 2015-01-13 15:44:01 -05:00
Tres Seaver
71edc31f23 Compatibility with Python2.6 unittest. 2015-01-13 15:38:10 -05:00
Tres Seaver
47ee4d37c1 Use 'io.BytesIO' rather than 'cStringIO.StringIO'. 2015-01-13 15:04:41 -05:00
Tres Seaver
d25e6686d9 Typo. 2015-01-13 15:04:00 -05:00
Tres Seaver
70dcdeb62c Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3 
Conflicts:
	python/setup.py
 2015-01-13 14:58:38 -05:00
Tres Seaver
fec1b8e444 Overlooked dependency. 2015-01-13 14:57:18 -05:00
Tres Seaver
9821016cfa Merge branch 'drop-apputils-dependency' into straddle_py2_py3 
Conflicts:
	python/google/protobuf/internal/message_factory_test.py
	python/google/protobuf/internal/reflection_test.py
	python/google/protobuf/internal/text_format_test.py
 2015-01-13 14:56:00 -05:00
Tres Seaver
7ee25830c6 Drop dependency on 'google.apputils'. 
Use stdlib's 'unittest' instead.
 2015-01-13 14:47:32 -05:00
Tres Seaver
f336d4b7a5 Prepare for Python2-Python3 straddle. 
- 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').
 2015-01-13 14:22:05 -05:00
Tres Seaver
7c7f06c50e Update to new canonical 'ez_setup.py'. 
Downloaded from https://bootstrap.pypa.io/ez_setup.py.
 2015-01-13 14:15:39 -05:00
Tres Seaver
e17f78bbbf Noramlize 'setup.py' to fit conventions: 
- 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.
 2015-01-13 14:09:54 -05:00
Feng Xiao
644a6a1da7 Merge pull request #143 from Ivoz/patch-1 
Update python version / setuptools instructions
 2014-12-22 09:52:00 -08:00
Feng Xiao
b60a6df9ae Merge pull request #46 from adalq/version 
Add __version__
 2014-12-20 17:46:35 -08:00
Matt Iversen
4186d4c9c9 Update python version / setuptools instructions 
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.
 2014-12-17 20:11:08 +11:00
Adal Chiriliuc
4f0170d465 Updated __version__ 2014-12-14 20:42:46 +02:00
Feng Xiao
cb0ba5f04c Update version number to v3.0.0-pre 2014-12-10 21:05:46 -08:00
Feng Xiao
81a630c66e Update version number to v3.0.0-alpha-1 2014-12-03 11:52:21 -08:00
Feng Xiao
d1ec493a12 Fix Python C++ implementation build issues: 
1. Haven't included the include path for "config.h".
  2. Use of C++11 auto keyword.
 2014-11-25 15:21:08 -08:00
Feng Xiao
99aa0f9e8f Down-integrate from internal code base. 2014-11-20 16:18:53 -08:00
Feng Xiao
f157a5651c Down-integrate from internal code base (C++ maps support). 2014-11-14 11:50:31 -08:00
Feng Xiao
643d09ac7d Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo 
Conflicts:
	src/google/protobuf/compiler/java/java_file.cc
 2014-11-11 11:01:32 -08:00
Feng Xiao
6ef984af4b Down-integrate from internal code base. 2014-11-10 17:34:54 -08:00
Veres Lajos
c76807211a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-08 22:59:34 +00:00
Feng Xiao
ad7f41bd57 Merge pull request #50 from dlitz/compat-py3k 
setup.py fixes for Python 3
 2014-11-08 02:25:53 -05:00
Feng Xiao
df5481c6b3 Update version number to 2.6.2-pre. 2014-10-21 16:47:33 -07:00
Feng Xiao
bba83652e1 Update version number to 2.6.1. 2014-10-20 17:06:06 -07:00
Dwayne Litzenberger
b460610b69 Omit google-apputils dependency under Python 3 
Temporary change until a py3k-compatible google-apputils is released.
 2014-10-14 13:50:52 -07:00
Dwayne Litzenberger
0fd260eae7 Use 2to3 when building under Python 3. 2014-10-14 13:47:11 -07:00
Adal Chiriliuc
374b95146e Add __version__ 
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__"
 2014-10-10 22:00:39 +03:00
Adal Chiriliuc
6f7aa2f678 Revert "Add __version__" 
This reverts commit 5337cf564f.
 2014-10-10 21:59:22 +03:00
Adal Chiriliuc
5337cf564f Add __version__ 
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__"
 2014-10-10 21:58:43 +03:00
Feng Xiao
d9d1da95c6 Update version number to 2.6.1rc1 2014-10-08 18:44:37 -07:00
Feng Xiao
0971bb0d57 Down-integrate from internal branch. 2014-10-07 17:44:48 -07:00
Feng Xiao
eb223ed4f7 Merge pull request #3 from dhirschfeld/pyext-fix 
Explicitly specify pyext/cpp_message.py in py_modules list
 2014-10-02 15:55:32 -07:00
Feng Xiao
e428862450 Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers 2014-10-01 16:26:23 -07:00
David Hirschfeld
ef6eff20bd Explicitly specify pyext/cpp_message.py in py_modules list 2014-08-27 09:25:26 +01:00
jieluo@google.com
a21bf2e646 merge 2.6.0 to trunk 2014-08-25 23:26:40 +00:00
jieluo@google.com
1eba9d9c74 merge tags/2.6.0 into trunk 2014-08-25 20:17:53 +00:00
jieluo@google.com
e61b513b1f make dist complains the file name is too long and refuse to put it to tar. Change the file to a shorter name 2014-08-14 21:51:48 +00:00
jieluo@google.com
24095cc7e5 Add deleted tests back for reflection_cpp2_test.py by addtional exception catch 2014-08-14 18:04:22 +00:00
jieluo@google.com
5dd5f0d09a change python README.txt 2014-08-13 23:26:54 +00:00
jieluo@google.com
b70e586603 put python cpp tests into pyext/ 2014-08-13 21:05:19 +00:00
jieluo@google.com
7580a8929f add shared_pr.h 2014-08-12 21:28:31 +00:00
jieluo@google.com
bde4a3254a down integrate python opensource to svn 2014-08-12 21:10:30 +00:00
jieluo@google.com
4de8f55113 down integrate to svn 2014-07-18 00:47:59 +00:00
xiaofeng@google.com
2c9392f8dd Update version number in trunk 2013-02-28 06:12:28 +00:00