Revision: 722
http://rpy.svn.sourceforge.net/rpy/?rev=722&view=rev
Author: lgautier
Date: 2008-12-19 20:58:12 +0000 (Fri, 19 Dec 2008)
Log Message:
-----------
Fallback for the numpy-conversion test suite in the case numpy is not installed
Modified Paths:
--------------
rpy2/branches/version_2.0.x/rpy/robjects/tests/testNumpyConversions.py
Modified: rpy2/branches/version_2.0.x/rpy/robjects/tests/testNumpyConversions.py
===================================================================
--- rpy2/branches/version_2.0.x/rpy/robjects/tests/testNumpyConversions.py
2008-12-17 12:53:50 UTC (rev 721)
+++ rpy2/branches/version_2.0.x/rpy/robjects/tests/testNumpyConversions.py
2008-12-19 20:58:12 UTC (rev 722)
@@ -2,10 +2,18 @@
import rpy2.robjects as robjects
r = robjects.r
-import numpy
-import rpy2.robjects.numpy2ri as rpyn
+try:
+ import numpy
+ has_numpy = True
+ import rpy2.robjects.numpy2ri as rpyn
+except:
+ has_numpy = False
+class MissingNumpyDummyTestCase(unittest.TestCase):
+ def testMissingNumpy(self):
+ self.assertTrue(False) # numpy is missing. No tests.
+
class NumpyConversionsTestCase(unittest.TestCase):
def setUp(self):
@@ -87,7 +95,10 @@
self.assertRaises(ValueError, robjects.conversion.py2ri, u)
def suite():
- return
unittest.TestLoader().loadTestsFromTestCase(NumpyConversionsTestCase)
+ if has_numpy:
+ return
unittest.TestLoader().loadTestsFromTestCase(NumpyConversionsTestCase)
+ else:
+ return
unittest.TestLoader().loadTestsFromTestCase(MissingNumpyDummyTestCase)
if __name__ == '__main__':
unittest.main()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
rpy-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rpy-list
