Commit graph

236 commits

Author SHA1 Message Date
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