From 07dc54fa30b4d7f9671f09d56d41dcd7d0b744e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 24 Aug 2022 19:00:05 +0200 Subject: [PATCH] ARROW-17518: [CI][Doc][Python] Update glob to detect arrow development version from git --- dev/archery/archery/crossbow/core.py | 2 +- python/pyarrow/__init__.py | 2 +- python/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py index 75b489f048d50..7f5d1442ffc81 100644 --- a/dev/archery/archery/crossbow/core.py +++ b/dev/archery/archery/crossbow/core.py @@ -696,7 +696,7 @@ def get_version(root, **kwargs): # query the calculated version based on the git tags kwargs['describe_command'] = ( - 'git describe --dirty --tags --long --match "apache-arrow-[0-9].*"' + 'git describe --dirty --tags --long --match "apache-arrow-[0-9]*.*"' ) version = parse_git_version(root, **kwargs) tag = str(version.tag) diff --git a/python/pyarrow/__init__.py b/python/pyarrow/__init__.py index a030a53e37c95..19d630bc0abf4 100644 --- a/python/pyarrow/__init__.py +++ b/python/pyarrow/__init__.py @@ -51,7 +51,7 @@ def parse_git(root, **kwargs): """ from setuptools_scm.git import parse kwargs['describe_command'] = \ - "git describe --dirty --tags --long --match 'apache-arrow-[0-9].*'" + "git describe --dirty --tags --long --match 'apache-arrow-[0-9]*.*'" return parse(root, **kwargs) __version__ = setuptools_scm.get_version('../', parse=parse_git) diff --git a/python/setup.py b/python/setup.py index 9fd7c480088b2..32106d6ab1495 100755 --- a/python/setup.py +++ b/python/setup.py @@ -586,7 +586,7 @@ def parse_git(root, **kwargs): """ from setuptools_scm.git import parse kwargs['describe_command'] =\ - 'git describe --dirty --tags --long --match "apache-arrow-[0-9].*"' + 'git describe --dirty --tags --long --match "apache-arrow-[0-9]*.*"' return parse(root, **kwargs)