Skip to content

Commit 809e4a9

Browse files
committed
Records tag for v1.2.0
1 parent e1943b1 commit 809e4a9

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tools/metadata.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
__version__ = '1.2.0'
2-
__version_long = '1.2.0+zzzzzzz'
2+
__version_long = '1.2.0+e1943b1'
33
__version_upcoming_annotated_v_tag = '1.3.0'
4-
__version_most_recent_release = '1.2.0'
4+
__version_most_recent_release = '1.2.0-rc1'
55

66

77
def version_formatter(dummy):

tools/versioner.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
#
1515
from __future__ import print_function
1616

17+
import argparse
1718
import os
1819
import re
19-
import sys
20-
import argparse
2120
import subprocess
21+
import sys
2222

2323

2424
def collect_version_input_from_fallback(meta_file='metadata.py'):
@@ -42,7 +42,7 @@ def is_git_repo(cwd='./', dot_git_qualifies=False, no_git_cmd_result=False):
4242
try:
4343
process = subprocess.Popen(
4444
command.split(), stderr=subprocess.PIPE, stdout=subprocess.PIPE, cwd=cwd, universal_newlines=True)
45-
except EnvironmentError:
45+
except EnvironmentError as e:
4646
# most likely, git command not available
4747
return no_git_cmd_result
4848

@@ -88,7 +88,7 @@ def collect_version_input_from_git():
8888
if mobj.group('tag'):
8989
# We got a tag!
9090
# normal: 0.1-62-ga68d223
91-
res['latest_annotated_v_tag'] = mobj.group('tag') # drop the "v"; tag mismatch caught later
91+
res['latest_annotated_v_tag'] = mobj.group('tag')[:-1] # drop the "v"; tag mismatch caught later
9292
res['commits_since_tag'] = mobj.group('commits')
9393
res['seven_char_hash'] = mobj.group('gsha')[1:] # drop the "g" git identifier
9494
else:

0 commit comments

Comments
 (0)