Skip to content

Update setup.py #20

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

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Update setup.py #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7364556
Update setup.py
Sparks29032 Oct 15, 2023
70236cb
Fix version tagging
Sparks29032 Oct 16, 2023
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
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
def gitinfo():
from subprocess import Popen, PIPE, check_output
kw = dict(stdout=PIPE, cwd=MYDIR, universal_newlines=True)
proc = Popen(['git', 'describe', '--tags', '--match=v[[:digit:]]*'], **kw)
proc = Popen(['git', 'describe', '--tags', '--match=[v,V,[:digit:]]*'], **kw)
desc = proc.stdout.read()
proc = Popen(['git', 'log', '-1', '--format=%H %ct %ci'], **kw)
glog = proc.stdout.read()
rv = {}
rv['commit'], rv['timestamp'], rv['date'] = glog.strip().split(None, 2)
version = check_output(['git', 'tag']).decode('ascii').strip()
version = '.post'.join(desc.strip().split('-')[:2]).lstrip('vV')
rv['version'] = version
return rv

Expand All @@ -56,7 +56,7 @@ def getversioncfg():
cp0.read(gitarchivecfgfile)
if len(cp0.get('DEFAULT', 'commit')) > 20:
g = cp0.defaults()
mx = re.search(r'\btag: v(\d[^,]*)', g.pop('refnames'))
mx = re.search(r'\btag: [vV]?(\d[^,]*)', g.pop('refnames'))
if mx:
g['version'] = mx.group(1)
# then try to obtain version data from git.
Expand Down