research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a deprecation warning with np.genfromtxt

Browse source
This commit is contained in:
Ray Speth 2012-05-25 23:13:47 +00:00
parent 3df5c60e8f
commit 396d34e1ab
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
site_scons/buildutils.py
View file

@ -278,6 +278,7 @@ def compareCsvFiles(env, file1, file2):
"""
try:
import numpy as np
hasSkipHeader = tuple(np.version.version.split('.')[:2]) >= ('1','4')
except ImportError:
print 'WARNING: skipping .csv diff because numpy is not installed'
return 0
@ -293,8 +294,12 @@ def compareCsvFiles(env, file1, file2):
break
try:
data1 = np.genfromtxt(file1, skiprows=headerRows, delimiter=',')
data2 = np.genfromtxt(file2, skiprows=headerRows, delimiter=',')
if hasSkipHeader:
data1 = np.genfromtxt(file1, skip_header=headerRows, delimiter=',')
data2 = np.genfromtxt(file2, skip_header=headerRows, delimiter=',')
else:
data1 = np.genfromtxt(file1, skiprows=headerRows, delimiter=',')
data2 = np.genfromtxt(file2, skiprows=headerRows, delimiter=',')
except (IOError, StopIteration) as e:
print e
return 1