Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARROW-17518: [CI][Doc][Python] Update glob to detect arrow development version from git #13966

Merged
merged 1 commit into from
Aug 25, 2022
Merged

ARROW-17518: [CI][Doc][Python] Update glob to detect arrow development version from git #13966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/archery/archery/crossbow/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]*.*"'
pitrou marked this conversation as resolved.
Show resolved Hide resolved
)
version = parse_git_version(root, **kwargs)
tag = str(version.tag)
Expand Down
2 changes: 1 addition & 1 deletion python/pyarrow/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]*.*'"
pitrou marked this conversation as resolved.
Show resolved Hide resolved
return parse(root, **kwargs)
__version__ = setuptools_scm.get_version('../',
parse=parse_git)
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]*.*"'
pitrou marked this conversation as resolved.
Show resolved Hide resolved
return parse(root, **kwargs)


Expand Down