Some Python3 related fixes.
This commit is contained in:
parent
768c2b3356
commit
a9b1fd9079
@ -25,7 +25,7 @@ if len(sys.argv) > 1:
|
|||||||
else:
|
else:
|
||||||
fileName = 'test.hdf5'
|
fileName = 'test.hdf5'
|
||||||
if not os.path.isfile(fileName):
|
if not os.path.isfile(fileName):
|
||||||
print "No suitable HDF5 file found. Use createFile() to generate an example file."
|
print("No suitable HDF5 file found. Use createFile() to generate an example file.")
|
||||||
os._exit(1)
|
os._exit(1)
|
||||||
|
|
||||||
plt = pg.plot()
|
plt = pg.plot()
|
||||||
|
2
setup.py
2
setup.py
@ -46,7 +46,7 @@ try:
|
|||||||
lastTag = gitCommit(lastTagName)
|
lastTag = gitCommit(lastTagName)
|
||||||
head = gitCommit('HEAD')
|
head = gitCommit('HEAD')
|
||||||
if head != lastTag:
|
if head != lastTag:
|
||||||
branch = re.search(r'\* (.*)', check_output(['git', 'branch'])).group(1)
|
branch = re.search(r'\* (.*)', check_output(['git', 'branch'], universal_newlines=True)).group(1)
|
||||||
version = version + "-%s-%s" % (branch, head[:10])
|
version = version + "-%s-%s" % (branch, head[:10])
|
||||||
|
|
||||||
# any uncommitted modifications?
|
# any uncommitted modifications?
|
||||||
|
Loading…
Reference in New Issue
Block a user