BUG: handle numpy 2.2 array abbreviation

NumPy 2.2 added shape= to the repr of abbreviated arrays. This is not a
legal argument to `array(...)` constructor, thus the result cannot be eval-ed.

Handle this case by removing the shape= bit.

Author: ev-br

scipy_doctest/impl.py

@@ -262,6 +262,22 @@ def has_masked(got):
     return 'masked_array' in got and '--' in got
 
 
+def remove_shape_from_abbrv(s_got):
+    """NumPy 2.2 added shape=(123,) to abbreviated array repr. Remove it.
+    """
+    if "shape=" in s_got:
+        # handle
+        # array(..., shape=(1000,))
+        # array(..., shape=(100, 100))
+        # array(..., shape=(100, 100), dtype=uint16)
+        grp = re.match(r'(.+) shape=\(([\d\s,]+\))(.+)', s_got, flags=re.DOTALL).groups()
+
+        s_got = grp[0] + grp[-1]
+        s_got = s_got.replace(',,', ',')
+
+    return ''.join(s_got.split('...,'))
+
+
 class DTChecker(doctest.OutputChecker):
     obj_pattern = re.compile(r'at 0x[0-9a-fA-F]+>')
     vanilla = doctest.OutputChecker()
@@ -325,11 +341,11 @@ def check_output(self, want, got, optionflags):
                 return self.check_output(s_want, s_got, optionflags)
 
             #handle array abbreviation for n-dimensional arrays, n >= 1
-            ndim_array = (s_want.startswith("array([") and s_want.endswith("])") and 
-                          s_got.startswith("array([") and s_got.endswith("])"))
+            ndim_array = (s_want.startswith("array([") and "..." in s_want and 
+                          s_got.startswith("array([") and "..." in s_got)
             if ndim_array:
-                s_want = ''.join(s_want.split('...,'))
-                s_got = ''.join(s_got.split('...,'))
+                s_want = remove_shape_from_abbrv(s_want)
+                s_got = remove_shape_from_abbrv(s_got)
                 return self.check_output(s_want, s_got, optionflags)
 
             # maybe we are dealing with masked arrays?

scipy_doctest/tests/module_cases.py

@@ -193,6 +193,43 @@ def array_abbreviation():
            [0,    0,    0, ...,    0,    0, 1000]])
     """
 
+
+def array_abbreviation_2():
+    """ NumPy 2.2 adds shape=(...) to abbreviated arrays.
+
+    So the actual numpy==2.2.0 output below is
+    # array([   0,    1,    2, ..., 9997, 9998, 9999], shape=(10000,))
+
+    This is not a valid argument to `array(...), so it cannot be eval-ed,
+    and need to be removed for doctesting.
+
+    >>> import numpy as np
+    >>> np.arange(10000)
+    array([   0,    1,    2, ..., 9997, 9998, 9999])
+
+    >>> np.arange(10000, dtype=np.uint16)
+    array([   0,    1,    2, ..., 9997, 9998, 9999], dtype=np.uint16)
+
+    >>> np.arange(5000).reshape(50, 100)
+    array([[   0,    1,    2, ...,   97,   98,   99],
+           [ 100,  101,  102, ...,  197,  198,  199],
+           [ 200,  201,  202, ...,  297,  298,  299],
+           ...,
+           [4700, 4701, 4702, ..., 4797, 4798, 4799],
+           [4800, 4801, 4802, ..., 4897, 4898, 4899],
+           [4900, 4901, 4902, ..., 4997, 4998, 4999]])
+
+    >>> np.arange(5000, dtype=np.uint16).reshape(50, 100)
+    array([[   0,    1,    2, ...,   97,   98,   99],
+           [ 100,  101,  102, ...,  197,  198,  199],
+           [ 200,  201,  202, ...,  297,  298,  299],
+           ...,
+           [4700, 4701, 4702, ..., 4797, 4798, 4799],
+           [4800, 4801, 4802, ..., 4897, 4898, 4899],
+           [4900, 4901, 4902, ..., 4997, 4998, 4999]], dtype=uint16)
+    """
+
+
 def nan_equal():
     """
     Test that nans are treated as equal.