Merge branch 'master' into mcflugen/use-bmi-abstract-base-class

mcflugen · mcflugen · commit 9b13948d289d · 2019-04-19T16:16:10.000-06:00
diff --git a/setup.py b/setup.py
@@ -26,3 +26,5 @@
     packages=find_packages(),
     cmdclass=versioneer.get_cmdclass(),
 )
+
+
diff --git a/tests/test_irf.py b/tests/test_irf.py
@@ -5,6 +5,7 @@
 import numpy as np
 import yaml
 
+from six.moves import range
 from heat import BmiHeat
 
 

Original file line number	Diff line number	Diff line change
`@@ -26,3 +26,5 @@`
`26`	`26`	`packages=find_packages(),`
`27`	`27`	`cmdclass=versioneer.get_cmdclass(),`
`28`	`28`	`)`
	`29`	`+`
	`30`	`+`