[arrow] branch master updated: ARROW-2464: [Python] Use a python_version marker instead of a condition

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apitrou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d0fbf1  ARROW-2464: [Python] Use a python_version marker instead of a condition
2d0fbf1 is described below

commit 2d0fbf12c47e157431a89333fc0be2b4c1dde9af
Author: Omer Katz <om...@gmail.com>
AuthorDate: Mon Apr 16 17:32:43 2018 +0200

    ARROW-2464: [Python] Use a python_version marker instead of a condition
    
    We should let pip decide if installing futures is needed.
    As such I've added a marker that limits the installation of the futures package to lower than 3.2 (when the package was first introduced).
    
    Author: Omer Katz <om...@gmail.com>
    
    Closes #1879 from thedrow/patch-1 and squashes the following commits:
    
    e64d712 <Omer Katz> Use a python_version marker instead of a condition.
---
 python/setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/python/setup.py b/python/setup.py
index 20b2416..8d26e09 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -447,10 +447,11 @@ class BinaryDistribution(Distribution):
         return True
 
 
-install_requires = ['numpy >= 1.10', 'six >= 1.0.0']
-
-if sys.version_info.major == 2:
-    install_requires.append('futures')
+install_requires = (
+    'numpy >= 1.10',
+    'six >= 1.0.0',
+    'futures;python_version<"3.2"'
+)
 
 
 def parse_version(root):

-- 
To stop receiving notification emails like this one, please contact
apitrou@apache.org.