rq for pull

core/twix_map_obj.py

@@ -9,7 +9,6 @@ import logging
 
 class twix_map_obj:
 
-    
     @property
     def filename(self):
         return self.fname

requirements.txt

-<<<<<<< HEAD
 numpy~=1.18.3
 attrdict~=2.0.1
 tqdm~=4.45.0
@@ -7,7 +6,4 @@ dataclasses~=0.7
 scipy~=1.4.1
 matplotlib~=3.2.1
 setuptools~=46.1.3
-=======
-numpy
-tqdm
->>>>>>> 5863e81335fa80e872adbd2c5dcce0e834f806bd
+pytest==5.3.5
\ No newline at end of file

tests/test_flags.py

@@ -13,4 +13,6 @@ test_data_gre = op.join(op.dirname(__file__), 'test_data', 'meas_MID00058_FID123
 def test_flagRemoveOS():
     twixObj = mapVBVD(test_data_gre, quiet=False)
     twixObj[1].image.flagRemoveOS = False
-    assert np.allclose(twixObj.image.fullSize, [4096, 32, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1])
\ No newline at end of file
+    assert np.allclose(twixObj.image.fullSize, [4096, 32, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1])
+
+test_flagRemoveOS()
\ No newline at end of file