[arrow] branch master updated: ARROW-5294: [Python] [CI] Fix manylinux1 build

[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 224d29c  ARROW-5294: [Python] [CI] Fix manylinux1 build
224d29c is described below

commit 224d29cc4c554784bc9340399d663bef0d6ae4ce
Author: Antoine Pitrou <an...@python.org>
AuthorDate: Thu May 9 12:15:29 2019 +0200

    ARROW-5294: [Python] [CI] Fix manylinux1 build
    
    There is a regression in setuptools_scm 3.3.0:
    https://github.com/pypa/setuptools_scm/issues/333
    
    Author: Antoine Pitrou <an...@python.org>
    
    Closes #4276 from pitrou/fix-manylinux-build and squashes the following commits:
    
    c17ec3e97 <Antoine Pitrou>   Fix manylinux1 build
---
 ci/conda_env_python.yml       | 2 +-
 python/requirements-wheel.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/conda_env_python.yml b/ci/conda_env_python.yml
index e9ea35d..83858c6 100644
--- a/ci/conda_env_python.yml
+++ b/ci/conda_env_python.yml
@@ -22,4 +22,4 @@ numpy>=1.14
 pandas
 pytest
 setuptools
-setuptools_scm
+setuptools_scm=3.2.0
diff --git a/python/requirements-wheel.txt b/python/requirements-wheel.txt
index 98ee98e..8cc4bab 100644
--- a/python/requirements-wheel.txt
+++ b/python/requirements-wheel.txt
@@ -1,5 +1,5 @@
 wheel==0.31.1
-setuptools_scm
+setuptools_scm==3.2.0
 six>=1.0.0
 numpy==1.14.5
 futures; python_version < "3.2"