PROTON-490: Support for py26 (cherry picked from commit c5b7f543a52f4d1f0fbe384b6244528f5ee38266)
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/cb59c19a Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/cb59c19a Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/cb59c19a Branch: refs/heads/master Commit: cb59c19abce5e3fa3879d54bff4ecb2e9bc0f136 Parents: 1354648 Author: Flavio Percoco <[email protected]> Authored: Thu Jun 18 15:52:40 2015 +0200 Committer: Ken Giusti <[email protected]> Committed: Thu Jun 18 14:01:04 2015 -0400 ---------------------------------------------------------------------- proton-c/bindings/python/setup.py | 7 ++++--- proton-c/bindings/python/tox.ini | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cb59c19a/proton-c/bindings/python/setup.py ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/setup.py b/proton-c/bindings/python/setup.py index 4cdd721..1eb3e64 100755 --- a/proton-c/bindings/python/setup.py +++ b/proton-c/bindings/python/setup.py @@ -315,7 +315,7 @@ class Configure(build_ext): _cproton.runtime_library_dirs.extend([install_lib]) - if sys.version_info.major >= 3: + if sys.version_info[0] >= 3: _cproton.libraries[0] = "qpid-proton%s" % ds_sys.get_config_var('EXT_SUFFIX')[:-3] # Register this new extension and make @@ -335,8 +335,9 @@ class Configure(build_ext): return not self.check_qpid_proton_version() def run(self): - # linux2 for python<3.0 - if sys.platform in ['linux', 'linux2']: + # linux2 for python<2.7 + # linux4 for python<2.6 + if sys.platform in ['linux', 'linux2', 'linux4']: if self.bundle_proton: self.bundle_libqpid_proton_extension() http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cb59c19a/proton-c/bindings/python/tox.ini ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/tox.ini b/proton-c/bindings/python/tox.ini index 8a8c87c..2bb26a6 100644 --- a/proton-c/bindings/python/tox.ini +++ b/proton-c/bindings/python/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py33,py34 +envlist = py26,py27,py33,py34 minversion = 1.4 skipdist = True --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
