diff options
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test/matrix_test.py | 1 | ||||
| -rw-r--r-- | test/test_bvh.py | 2 | ||||
| -rw-r--r-- | test/test_bvh_simple.py | 2 | ||||
| -rw-r--r-- | test/test_cache.py | 2 | ||||
| -rw-r--r-- | test/test_detector.py | 2 | ||||
| -rw-r--r-- | test/test_generator_photon.py | 2 | ||||
| -rw-r--r-- | test/test_generator_vertex.py | 2 | ||||
| -rw-r--r-- | test/test_io.py | 2 | ||||
| -rw-r--r-- | test/test_parabola.py | 2 | ||||
| -rw-r--r-- | test/test_pdf.py | 2 | ||||
| -rw-r--r-- | test/test_propagation.py | 2 | ||||
| -rw-r--r-- | test/test_ray_intersection.py | 2 | ||||
| -rw-r--r-- | test/test_rayleigh.py | 2 | ||||
| -rw-r--r-- | test/test_reemission.py | 2 | ||||
| -rw-r--r-- | test/test_sample_cdf.py | 2 | ||||
| -rw-r--r-- | test/unittest_find.py | 7 |
17 files changed, 23 insertions, 15 deletions
@@ -74,7 +74,7 @@ setup( setup_requires = ['pyublas'], install_requires = ['uncertainties','pyzmq-static','spnav', 'pycuda', - 'numpy>=1.6', 'pygame', 'nose', 'sphinx'], + 'numpy>=1.6', 'pygame', 'nose', 'sphinx', 'unittest2'], test_suite = 'nose.collector', ) diff --git a/test/matrix_test.py b/test/matrix_test.py index bfc49ad..f204175 100644 --- a/test/matrix_test.py +++ b/test/matrix_test.py @@ -1,5 +1,6 @@ import os import numpy as np +np.seterr(divide='ignore') from pycuda import autoinit from pycuda.compiler import SourceModule import pycuda.driver as cuda diff --git a/test/test_bvh.py b/test/test_bvh.py index a43c16d..0c0c705 100644 --- a/test/test_bvh.py +++ b/test/test_bvh.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest from chroma.bvh.bvh import BVH, BVHLayerSlice, WorldCoords, uint4, \ OutOfRangeError, unpack_nodes import numpy as np diff --git a/test/test_bvh_simple.py b/test/test_bvh_simple.py index f68172f..c3743fd 100644 --- a/test/test_bvh_simple.py +++ b/test/test_bvh_simple.py @@ -1,5 +1,5 @@ import pycuda.autoinit -import unittest +from unittest_find import unittest from chroma.bvh import make_simple_bvh, BVH from chroma.bvh.bvh import node_areas import chroma.models diff --git a/test/test_cache.py b/test/test_cache.py index e4bb165..b6b40d9 100644 --- a/test/test_cache.py +++ b/test/test_cache.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find from unittest_find import unittest import os import shutil import tempfile diff --git a/test/test_detector.py b/test/test_detector.py index 010da70..feaf5ab 100644 --- a/test/test_detector.py +++ b/test/test_detector.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest import numpy as np from chroma.geometry import Solid, Geometry, vacuum diff --git a/test/test_generator_photon.py b/test/test_generator_photon.py index 37248cf..0146be9 100644 --- a/test/test_generator_photon.py +++ b/test/test_generator_photon.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest import itertools from chroma import generator diff --git a/test/test_generator_vertex.py b/test/test_generator_vertex.py index cec363d..f959b98 100644 --- a/test/test_generator_vertex.py +++ b/test/test_generator_vertex.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest import itertools import numpy as np import chroma.generator.vertex diff --git a/test/test_io.py b/test/test_io.py index 15daab6..efcba33 100644 --- a/test/test_io.py +++ b/test/test_io.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find from unittest_find import unittest from chroma.io import root from chroma import event import numpy as np diff --git a/test/test_parabola.py b/test/test_parabola.py index 7d7e7b2..54708d7 100644 --- a/test/test_parabola.py +++ b/test/test_parabola.py @@ -1,7 +1,7 @@ import chroma.parabola as parabola import numpy from uncertainties import ufloat, unumpy -import unittest +from unittest_find import unittest from numpy.testing import assert_almost_equal class Test1D(unittest.TestCase): diff --git a/test/test_pdf.py b/test/test_pdf.py index 0ad87d8..1b12dfb 100644 --- a/test/test_pdf.py +++ b/test/test_pdf.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest import numpy as np import itertools diff --git a/test/test_propagation.py b/test/test_propagation.py index 114fcfb..0531ec2 100644 --- a/test/test_propagation.py +++ b/test/test_propagation.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest import numpy as np from chroma.geometry import Solid, Geometry, vacuum diff --git a/test/test_ray_intersection.py b/test/test_ray_intersection.py index edc7558..6fcd4a3 100644 --- a/test/test_ray_intersection.py +++ b/test/test_ray_intersection.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest import chroma import numpy as np import os diff --git a/test/test_rayleigh.py b/test/test_rayleigh.py index 0b3274d..91e45ca 100644 --- a/test/test_rayleigh.py +++ b/test/test_rayleigh.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest import numpy as np from chroma.geometry import Solid, Geometry diff --git a/test/test_reemission.py b/test/test_reemission.py index 754eaed..a061dd8 100644 --- a/test/test_reemission.py +++ b/test/test_reemission.py @@ -1,4 +1,4 @@ -import unittest +from unittest_find import unittest import numpy as np import scipy.stats #import matplotlib.pyplot as plt diff --git a/test/test_sample_cdf.py b/test/test_sample_cdf.py index 1510768..f079db0 100644 --- a/test/test_sample_cdf.py +++ b/test/test_sample_cdf.py @@ -4,7 +4,7 @@ from pycuda import gpuarray import numpy as np import ROOT import os -import unittest +from unittest_find import unittest import chroma class TestSampling(unittest.TestCase): diff --git a/test/unittest_find.py b/test/unittest_find.py new file mode 100644 index 0000000..b8c8849 --- /dev/null +++ b/test/unittest_find.py @@ -0,0 +1,7 @@ +import sys + +if sys.version_info < (2,7): + import unittest2 as unittest +else: + import unittest + |