[python-arrayfire] 245/250: Changing setup.py to avoid conflicts between master and devel

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository python-arrayfire.

commit 57f0045e1be09300b22c4f8a8d3f2395dfa83813
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Mon Mar 28 17:14:33 2016 -0400

    Changing setup.py to avoid conflicts between master and devel
---
 setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6311b84..f871c97 100644
--- a/setup.py
+++ b/setup.py
@@ -15,11 +15,16 @@ from setuptools import setup, find_packages
 ## 1) Look for af libraries during setup
 ## 2) Include test suite
 
+# Some hackery to avoid merge conflicts between master and devel
+current_version = "3.3.20160320"
+devel_version = "3.3.0"
+release_version = current_version if current_version > devel_version else devel_version
+
 setup(
     author="Pavan Yalamanchili",
     author_email="pavan at arrayfire.com",
     name="arrayfire",
-    version="3.3.20160320",
+    version=release_version
     description="Python bindings for ArrayFire",
     license="BSD",
     url="http://arrayfire.com",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-arrayfire.git