[arrow] branch master updated: ARROW-4855: [Packaging] Generate default package version based on cpp tags in crossbow.py

[kszucs]

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

kszucs 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 71c529f  ARROW-4855: [Packaging] Generate default package version 
based on cpp tags in crossbow.py
71c529f is described below

commit 71c529fa779f33fca03e88766a3c1d841970e2e3
Author: Krisztián Szűcs <szucs.kriszt...@gmail.com>
AuthorDate: Mon Mar 18 12:38:16 2019 +0100

    ARROW-4855: [Packaging] Generate default package version based on cpp tags 
in crossbow.py
    
    It picked up wrong version because of the recent JS release.
    
    Author: Krisztián Szűcs <szucs.kriszt...@gmail.com>
    
    Closes #3886 from kszucs/crossbow-manylinux and squashes the following 
commits:
    
    f6d5cfeb <Krisztián Szűcs> generate crossbow version based on cpp tags
---
 dev/tasks/crossbow.py                    | 17 ++++++++++++++---
 dev/tasks/python-wheels/travis.linux.yml |  4 +---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dev/tasks/crossbow.py b/dev/tasks/crossbow.py
index 08b6198..53571f1 100755
--- a/dev/tasks/crossbow.py
+++ b/dev/tasks/crossbow.py
@@ -34,7 +34,7 @@ from pathlib import Path
 from textwrap import dedent
 from datetime import datetime
 from jinja2 import Template, StrictUndefined
-from setuptools_scm import get_version
+from setuptools_scm.git import parse as parse_git_version
 from ruamel.yaml import YAML
 
 
@@ -382,6 +382,16 @@ class Queue(Repo):
                                      content_type=content_type)
 
 
+def get_version(root, **kwargs):
+    """
+    Parse function for setuptools_scm that ignores tags for non-C++
+    subprojects, e.g. apache-arrow-js-XXX tags.
+    """
+    kwargs['describe_command'] =\
+        'git describe --dirty --tags --long --match "apache-arrow-[0-9].*"'
+    return parse_git_version(root, **kwargs)
+
+
 class Target:
     """Describes target repository and revision the builds run against
 
@@ -402,12 +412,13 @@ class Target:
     def from_repo(cls, repo, version=None):
         assert isinstance(repo, Repo)
         if version is None:
-            version = get_version(repo.path, local_scheme=lambda v: '')
+            version = get_version(repo.path)
+            formatted_version = version.format_with('{tag}.dev{distance}')
         return cls(head=str(repo.head.target),
                    email=repo.email,
                    branch=repo.branch.branch_name,
                    remote=repo.remote_url,
-                   version=version)
+                   version=formatted_version)
 
 
 class Task:
diff --git a/dev/tasks/python-wheels/travis.linux.yml 
b/dev/tasks/python-wheels/travis.linux.yml
index cccb30b..9d8dd57 100644
--- a/dev/tasks/python-wheels/travis.linux.yml
+++ b/dev/tasks/python-wheels/travis.linux.yml
@@ -15,9 +15,7 @@
 # limitations under the License.
 
 os: linux
-dist: trusty
-sudo: required
-language: cpp
+
 services:
   - docker