Merge pull request #206 from jadball/colfile_fixes

Resurrect tests for columnfile.py, correct np.int
FABLE-3DXRD · Jan 24, 2024 · deb6644 · deb6644
2 parents cea535c + 1f52918
commit deb6644
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ImageD11/columnfile.py b/ImageD11/columnfile.py
@@ -212,7 +212,7 @@ def removerows( self, column_name, values, tol = 0 ):
         """
         col = self.getcolumn( column_name )
         if tol <= 0: # integer comparisons
-            col = col.astype( np.int )
+            col = col.astype( int )
             mskfun = lambda x, val, t: x == val
         else:        # floating point
             mskfun = lambda x, val, t: np.abs( x - val ) < t

diff --git a/test/run_tests.py b/test/run_tests.py
@@ -18,7 +18,7 @@
     "test_sparse_image",
     "test_cImageD11",
     "gv_general.test_gv_general",
-    "testcolumnfile",
+    "test_columnfile",
     "test_put_incr",
     "testscale",
     "test_ubito",
@@ -32,6 +32,7 @@
     "test_compress_duplicates",
     "eps_sig.test_eps",
     "test_finite_strain",
+    "test_stress"
 ]
 
 if "all" in sys.argv:

diff --git a/test/testcolumnfile.py → test/test_columnfile.py b/test/testcolumnfile.py → test/test_columnfile.py