Bumped required scipy version to 0.13

awf · Aug 30, 2014 · 9973a5d · 9973a5d
1 parent 2bb82be
commit 9973a5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 from distutils.core import setup
 
 setup(name='chumpy',
-    version='0.57',
+    version='0.58',
     #py_modules=['ch', 'ch_ops', 'linalg', 'utils', 'api_compatibility', 'ch_random', 'test_ch', 'test_inner_composition', 'test_linalg'],
     packages = ['chumpy'],
     package_dir = {'chumpy': '.'},
@@ -16,7 +16,7 @@
     url='https://github.com/mattloper/chumpy',
     description='chumpy',
     license='MIT',
-    install_requires=['numpy >= 1.8.1', 'scipy >= 0.11.0'],
+    install_requires=['numpy >= 1.8.1', 'scipy >= 0.13.0'],
 
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[

diff --git a/test_ch.py b/test_ch.py
@@ -208,6 +208,7 @@ def test_stacking(self):
     #    print c.dr_wrt(a)
     #    print c.compute_drs_wrt(a).r
 
+    @unittest.skip('We are using LinearOperator for this for now. Might change back though.')
     def test_reorder_caching(self):
         a = ch.Ch(np.zeros(8).reshape((4,2)))
         b = a.T
@@ -221,20 +222,22 @@ def test_reorder_caching(self):
 
     def test_transpose(self):
         from utils import row, col
+        from copy import deepcopy
         for which in ('C', 'F'): # test in fortran and contiguous mode
             a = ch.Ch(np.require(np.zeros(8).reshape((4,2)), requirements=which))
             b = a.T
 
             b1 = b.r.copy()
-            dr = b.dr_wrt(a).copy()
+            #dr = b.dr_wrt(a).copy()
+            dr = deepcopy(b.dr_wrt(a))
 
             diff = np.arange(a.size).reshape(a.shape)
             a.x = np.require(a.r + diff, requirements=which)
             b2 = b.r.copy()
 
             diff_pred = dr.dot(col(diff)).ravel()
             diff_emp =  (b2 - b1).ravel()
-            np.testing.assert_array_equal(diff_pred, diff_emp) 
+            np.testing.assert_array_equal(diff_pred, diff_emp)             
 
 
     def test_unary(self):