You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/02/28 19:00:20 UTC

[arrow] branch master updated: ARROW-2230: [Python] Strip catch-all tag matching from git-describe

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

wesm 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 d3fabe0  ARROW-2230: [Python] Strip catch-all tag matching from git-describe
d3fabe0 is described below

commit d3fabe0f5318a7b0767bc097962372bad19edae3
Author: Korn, Uwe <Uw...@blue-yonder.com>
AuthorDate: Wed Feb 28 14:00:15 2018 -0500

    ARROW-2230: [Python] Strip catch-all tag matching from git-describe
    
    Author: Korn, Uwe <Uw...@blue-yonder.com>
    
    Closes #1676 from xhochy/ARROW-2230 and squashes the following commits:
    
    b46c1a27 <Korn, Uwe> ARROW-2230:  Strip catch-all tag matching from git-describe
---
 python/setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python/setup.py b/python/setup.py
index 849d120..2a63264 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -422,6 +422,8 @@ def parse_version(root):
     from setuptools_scm import version_from_scm
     import setuptools_scm.git
     describe = setuptools_scm.git.DEFAULT_DESCRIBE + " --match 'apache-arrow-[0-9]*'"
+    # Strip catchall from the commandline
+    describe = describe.replace("--match *.*", "")
     version = setuptools_scm.git.parse(root, describe)
     if not version:
         return version_from_scm(root)

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