Merge pull request matplotlib#30274 from QuLogic/fix-preload

ci: Fix image preload with multiple conflicts

Author: QuLogic

.github/workflows/tests.yml

@@ -107,8 +107,8 @@ jobs:
                       lib/matplotlib/tests/baseline_images \
                       lib/mpl_toolkits/*/tests/baseline_images)
           if [ -n "${conflicts}" ]; then
-            git checkout --ours -- "${conflicts}"
-            git add -- "${conflicts}"
+            git checkout --ours -- ${conflicts}
+            git add -- ${conflicts}
           fi
           # If committing fails, there were conflicts other than the baseline images,
           # which should not be allowed to happen, and should fail the build.

azure-pipelines.yml

@@ -79,8 +79,8 @@ stages:
                           lib/matplotlib/tests/baseline_images \
                           lib/mpl_toolkits/*/tests/baseline_images)
               if [ -n "${conflicts}" ]; then
-                git checkout --ours -- "${conflicts}"
-                git add -- "${conflicts}"
+                git checkout --ours -- ${conflicts}
+                git add -- ${conflicts}
               fi
               # If committing fails, there were conflicts other than the baseline images,
               # which should not be allowed to happen, and should fail the build.

lib/matplotlib/mlab.py

@@ -219,9 +219,6 @@ def _stride_windows(x, n, noverlap=0):
         raise ValueError(f'n ({n}) and noverlap ({noverlap}) must be positive integers '
                          f'with n < noverlap and n <= x.size ({x.size})')
 
-    if n == 1 and noverlap == 0:
-        return x[np.newaxis]
-
     step = n - noverlap
     shape = (n, (x.shape[-1]-noverlap)//step)
     strides = (x.strides[0], step*x.strides[0])