Merge pull request FABLE-3DXRD#380 from jonwright/master

suppress warnings for pytest on ubuntu with 3.12
jadball · Jan 18, 2025 · 9090b3a · 9090b3a
2 parents 7c9b16f + 662a8a4
commit 9090b3a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ImageD11/columnfile.py b/ImageD11/columnfile.py
@@ -900,7 +900,7 @@ def readfile(self, filename):
             column_titles = raw[first_data_row - 1].replace("# ", "").lstrip(" ").split()
             # print(f"Column titles are {column_titles}")
 
-            self._df = pd.read_csv(filename, skiprows=range(first_data_row), sep='\s+', header=None, names=column_titles)
+            self._df = pd.read_csv(filename, skiprows=range(first_data_row), sep=r'\s+', header=None, names=column_titles)
 
             self.parameters.dumbtypecheck()
             # self.set_attributes()

diff --git a/ImageD11/sinograms/geometry.py b/ImageD11/sinograms/geometry.py
@@ -52,15 +52,15 @@
 Step space:
 
                 +ve
-                /\
+                ^
                 |
               i |
                 |
 -ve <--------   S (0, 0)--------> +ve
                 |           j
                 |
                 |
-               \/
+                v
               -ve
 
 

diff --git a/test/testdatasets/test_datasets.py b/test/testdatasets/test_datasets.py
@@ -24,7 +24,7 @@ def testcase(dataroot = '/data/id11/nanoscope/ihmi1452/id11',
     mfile = os.path.join( dataroot, sample, dsname, dsname+'.h5' )
     if not os.path.exists( mfile ):
         print( "Missing files", mfile )
-        return False
+        return # False
     try:
         result = ImageD11.sinograms.dataset.check( dataroot, 
                                                    analysisroot,
@@ -38,7 +38,7 @@ def testcase(dataroot = '/data/id11/nanoscope/ihmi1452/id11',
     finally:
         print("Remove",destination)
         os.unlink( destination )
-    return result
+    return # result
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,15 +52,15 @@ @@
     Step space:
                     +ve
-                    /\
+                    ^
                     |
                   i |
                     |
     -ve <--------   S (0, 0)--------> +ve
                     |           j
                     |
                     |
-                   \/
+                    v
                   -ve
@@ Expand Down @@