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

108 Commits

Author SHA1 Message Date
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
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
xiaofeng@google.com
a36f1b43e7 Exclude a failing test in MingW build. 2013-02-26 17:49:03 +00:00
xiaofeng@google.com
7f372559cc Down-integrate from internal branch 2013-02-25 10:39:39 +00:00