test: Fix ellipsis placement and handle NumPy spacing in raster doctests

Author: Khansa435

python/grass/pygrass/raster/__init__.py

@@ -120,13 +120,13 @@ class RasterRow(RasterAbstractBase):
 
         Open a raster map using the *with statement*:
 
-        >>> with RasterRow(test_raster_name) as elev:
+        >>> with RasterRow(test_raster_name) as elev:  # doctest: +ELLIPSIS
         ...     for row in elev:
-        ...         row  # doctest: +ELLIPSIS
-        Buffer([11, 21, 31, 41]...)
-        Buffer([12, 22, 32, 42]...)
-        Buffer([13, 23, 33, 43]...)
-        Buffer([14, 24, 34, 44]...)
+        ...         row
+        Buffer([...11, 21, 31, 41]...)
+        Buffer([...12, 22, 32, 42]...)
+        Buffer([...13, 23, 33, 43]...)
+        Buffer([...14, 24, 34, 44]...)
 
         >>> elev.is_open()
         False
@@ -147,9 +147,9 @@ def get_row(self, row, row_buffer=None):
         >>> elev = RasterRow(test_raster_name)
         >>> elev.open()
         >>> elev[0]  # doctest: +ELLIPSIS
-        Buffer([11, 21, 31, 41]...)
+        Buffer([...11, 21, 31, 41]...)
         >>> elev.get_row(0)  # doctest: +ELLIPSIS
-        Buffer([11, 21, 31, 41]...)
+        Buffer([...11, 21, 31, 41]...)
 
         """
         if row_buffer is None:
@@ -269,12 +269,12 @@ def get_row(self, row, row_buffer=None):
 
             >>> elev = RasterRowIO(test_raster_name)
             >>> elev.open("r")
-            >>> for row in elev:
-            ...     row  # doctest: +ELLIPSIS
-            Buffer([11, 21, 31, 41]...)
-            Buffer([12, 22, 32, 42]...)
-            Buffer([13, 23, 33, 43]...)
-            Buffer([14, 24, 34, 44]...)
+            >>> for row in elev:  # doctest: +ELLIPSIS
+            ...     row
+            Buffer([...11, 21, 31, 41]...)
+            Buffer([...12, 22, 32, 42]...)
+            Buffer([...13, 23, 33, 43]...)
+            Buffer([...14, 24, 34, 44]...)
 
             >>> elev.close()
 
@@ -366,23 +366,23 @@ def get_row(self, row, row_buffer=None):
 
             >>> elev = RasterRowIO(test_raster_name)
             >>> elev.open("r")
-            >>> for row in elev:
-            ...     row  # doctest: +ELLIPSIS
-            Buffer([11, 21, 31, 41]...)
-            Buffer([12, 22, 32, 42]...)
-            Buffer([13, 23, 33, 43]...)
-            Buffer([14, 24, 34, 44]...)
+            >>> for row in elev:  # doctest: +ELLIPSIS
+            ...     row
+            Buffer([...11, 21, 31, 41]...)
+            Buffer([...12, 22, 32, 42]...)
+            Buffer([...13, 23, 33, 43]...)
+            Buffer([...14, 24, 34, 44]...)
 
             >>> elev.close()
 
 
-            >>> with RasterSegment(test_raster_name) as elev:
+            >>> with RasterSegment(test_raster_name) as elev:  # doctest: +ELLIPSIS
             ...     for row in elev:
-            ...         row  # doctest: +ELLIPSIS
-            Buffer([11, 21, 31, 41]...)
-            Buffer([12, 22, 32, 42]...)
-            Buffer([13, 23, 33, 43]...)
-            Buffer([14, 24, 34, 44]...)
+            ...         row
+            Buffer([...11, 21, 31, 41]...)
+            Buffer([...12, 22, 32, 42]...)
+            Buffer([...13, 23, 33, 43]...)
+            Buffer([...14, 24, 34, 44]...)
 
         """
         if row_buffer is None:
@@ -409,12 +409,12 @@ def put_row(self, row, row_buffer):
 
         >>> map_b = RasterSegment(test_raster_name + "_segment")
         >>> map_b.open("r")
-        >>> for row in map_b:
-        ...     row  # doctest: +ELLIPSIS
-        Buffer([1011, 1021, 1031, 1041]...)
-        Buffer([1012, 1022, 1032, 1042]...)
-        Buffer([1013, 1023, 1033, 1043]...)
-        Buffer([1014, 1024, 1034, 1044]...)
+        >>> for row in map_b:  # doctest: +ELLIPSIS
+        ...     row
+        Buffer([...1011, 1021, 1031, 1041]...)
+        Buffer([...1012, 1022, 1032, 1042]...)
+        Buffer([...1013, 1023, 1033, 1043]...)
+        Buffer([...1014, 1024, 1034, 1044]...)
         >>> map_b.close()
 
         """
@@ -478,12 +478,12 @@ def put(self, row, col, val):
 
             >>> map_b = RasterSegment(test_raster_name + "_segment")
             >>> map_b.open("r")
-            >>> for row in map_b:
-            ...     row  # doctest: +ELLIPSIS
-            Buffer([111., 121., 131., 141.]...)
-            Buffer([112., 122., 132., 142.]...)
-            Buffer([113., 123., 133., 143.]...)
-            Buffer([114., 124., 134., 144.]...)
+            >>> for row in map_b:  # doctest: +ELLIPSIS
+            ...     row
+            Buffer([...111., 121., 131., 141.]...)
+            Buffer([...112., 122., 132., 142.]...)
+            Buffer([...113., 123., 133., 143.]...)
+            Buffer([...114., 124., 134., 144.]...)
             >>> map_b.close()
 
         """

python/grass/pygrass/raster/abstract.py

@@ -55,7 +55,7 @@ def __init__(self, name, mapset=""):
         cols: 4
         north: 40.0 south: 0.0 nsres:10.0
         east:  40.0 west: 0.0 ewres:10.0
-        range: 11, 44
+        range: ...11, ...44
         ...
         <BLANKLINE>
 

python/grass/pygrass/utils.py

@@ -276,11 +276,11 @@ def get_raster_for_points(poi_vector, raster, column=None, region=None):
 
     Sample the raster layer at the given points, return a list of values
 
-    >>> l = get_raster_for_points(vect, ele, region=region)
-    >>> l[0]  # doctest: +ELLIPSIS
-    (1, 10.0, 6.0, ...)
-    >>> l[1]  # doctest: +ELLIPSIS
-    (2, 12.0, 6.0, ...)
+    >>> l = get_raster_for_points(vect, ele, region=region)  # doctest: +ELLIPSIS
+    >>> l[0]
+    (...1, 10.0, 6.0, ...)
+    >>> l[1]
+    (...2, 12.0, 6.0, ...)
 
     Add a new column and sample again
 
@@ -296,9 +296,9 @@ def get_raster_for_points(poi_vector, raster, column=None, region=None):
     >>> cur = vect.table.execute()
     >>> r = cur.fetchall()
     >>> r[0]  # doctest: +ELLIPSIS
-    (10.0, 1.0)
+    (...10.0, ...1.0)
     >>> r[1]  # doctest: +ELLIPSIS
-    (12.0, 1.0)
+    (...12.0, ...1.0)
     >>> vect.close()
     >>> remove("test_vect_2", "vect")