Skip to content

Commit a217446

Browse files
committed
python 3 support for calc_release_version.py
1 parent cb4bba6 commit a217446

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

build/calc_release_version.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
DEBUG = len(sys.argv) > 1 and '-d' in sys.argv
3232
if DEBUG:
33-
print 'Debugging output enabled.'
33+
print('Debugging output enabled.')
3434

3535
# This option indicates we are to determine the previous release version
3636
PREVIOUS = len(sys.argv) > 1 and '-p' in sys.argv
@@ -60,13 +60,13 @@ def check_head_tag(repo):
6060
new_version_loose = LooseVersion(release_tag_match.group('ver'))
6161
if new_version_loose > version_loose:
6262
if DEBUG:
63-
print 'HEAD release tag: ' + release_tag_match.group('ver')
63+
print('HEAD release tag: ' + release_tag_match.group('ver'))
6464
version_loose = new_version_loose
6565
found_tag = True
6666

6767
if found_tag:
6868
if DEBUG:
69-
print 'Calculated version: ' + str(version_loose)
69+
print('Calculated version: ' + str(version_loose))
7070
return str(version_loose)
7171

7272
return None
@@ -100,7 +100,7 @@ def main():
100100
+ '+git' + repo.head.commit.hexsha[:10]
101101

102102
if DEBUG:
103-
print 'Calculating release version for branch: ' + repo.active_branch.name
103+
print('Calculating release version for branch: ' + repo.active_branch.name)
104104
if repo.active_branch.name == 'master':
105105
version_new = {}
106106
# Use refs (not branches) to get local branches plus remote branches
@@ -119,8 +119,8 @@ def main():
119119
if new_version_loose > version_loose:
120120
version_loose = new_version_loose
121121
if DEBUG:
122-
print 'Found new best version "' + str(version_loose) \
123-
+ '" on branch "' + ref.name + '"'
122+
print('Found new best version "' + str(version_loose) \
123+
+ '" on branch "' + ref.name + '"')
124124

125125
else:
126126
gexc = Git('.')
@@ -143,8 +143,8 @@ def main():
143143
if new_version_loose > version_loose:
144144
version_loose = new_version_loose
145145
if DEBUG:
146-
print 'Found new best version "' + str(version_loose) \
147-
+ '" from tag "' + release_tag_match.group('ver') + '"'
146+
print('Found new best version "' + str(version_loose) \
147+
+ '" from tag "' + release_tag_match.group('ver') + '"')
148148

149149
return str(version_loose)
150150

@@ -154,7 +154,7 @@ def previous(rel_ver):
154154
tag that is strictly a lower version than the given release version.
155155
"""
156156
if DEBUG:
157-
print 'Calculating previous release version (option -p was specified).'
157+
print('Calculating previous release version (option -p was specified).')
158158
version_loose = LooseVersion('0.0.0')
159159
rel_ver_loose = LooseVersion(rel_ver)
160160
gexc = Git('.')
@@ -174,14 +174,14 @@ def previous(rel_ver):
174174
if new_version_loose < rel_ver_loose:
175175
version_loose = new_version_loose
176176
if DEBUG:
177-
print 'Found new best version "' + str(version_loose) \
178-
+ '" from tag "' + tag + '"'
177+
print('Found new best version "' + str(version_loose) \
178+
+ '" from tag "' + tag + '"')
179179
return str(version_loose)
180180

181181
return str(version_loose)
182182

183183
RELEASE_VER = previous(main()) if PREVIOUS else main()
184184

185185
if DEBUG:
186-
print 'Final calculated release version:',
187-
print RELEASE_VER
186+
print('Final calculated release version:', end=' ')
187+
print(RELEASE_VER)

0 commit comments

Comments
 (0)