Merge branch 'main' into feat/autoshare-auto-detect

Author: cvanelteren

.github/workflows/build-ultraplot.yml

@@ -221,31 +221,94 @@ jobs:
               echo "No valid nodeids found on PR branch; skipping image comparison."
               exit 0
             else
+              status=0
               echo "=== Memory before image comparison ===" && free -h
+              set +e
               pytest -n ${PYTEST_WORKERS} --dist loadfile --tb=short --disable-warnings -W ignore \
-              --mpl \
-              --mpl-baseline-path=./ultraplot/tests/baseline \
-              --mpl-results-path=./results/ \
-              --mpl-generate-summary=html \
-              --mpl-default-style="./ultraplot.yml" \
-              "${FILTERED_NODEIDS[@]}" || status=$?
+                --mpl \
+                --mpl-baseline-path=./ultraplot/tests/baseline \
+                --mpl-results-path=./results/ \
+                --mpl-generate-summary=html \
+                --mpl-default-style="./ultraplot.yml" \
+                --junitxml=./results/junit.xml \
+                "${FILTERED_NODEIDS[@]}"
+              status=$?
+              set -e
               echo "=== Memory after image comparison ===" && free -h
+              if [ "$status" -ne 0 ] && [ -f ./results/junit.xml ]; then
+                if python - <<'PY'
+import sys
+import xml.etree.ElementTree as ET
+try:
+    root = ET.parse("./results/junit.xml").getroot()
+except Exception:
+    sys.exit(1)
+if root.tag == "testsuites":
+    suites = list(root.findall("testsuite"))
+else:
+    suites = [root]
+failures = 0
+errors = 0
+for suite in suites:
+    failures += int(suite.attrib.get("failures", 0) or 0)
+    errors += int(suite.attrib.get("errors", 0) or 0)
+sys.exit(0 if (failures == 0 and errors == 0) else 1)
+PY
+                then
+                  echo "pytest exited with $status but junit reports no failures/errors; overriding exit status to 0."
+                  status=0
+                fi
+              fi
               if [ "$status" -eq 4 ] || [ "$status" -eq 5 ]; then
                 echo "No tests collected from selected nodeids; skipping image comparison."
                 status=0
               fi
             fi
             exit "$status"
           else
+            status=0
             echo "=== Memory before image comparison ===" && free -h
+            set +e
             pytest -n ${PYTEST_WORKERS} --dist loadfile --tb=short --disable-warnings -W ignore \
               --mpl \
               --mpl-baseline-path=./ultraplot/tests/baseline \
               --mpl-results-path=./results/ \
               --mpl-generate-summary=html \
               --mpl-default-style="./ultraplot.yml" \
+              --junitxml=./results/junit.xml \
               ultraplot/tests
+            status=$?
+            set -e
             echo "=== Memory after image comparison ===" && free -h
+            if [ "$status" -ne 0 ] && [ -f ./results/junit.xml ]; then
+              if python - <<'PY'
+import sys
+import xml.etree.ElementTree as ET
+try:
+    root = ET.parse("./results/junit.xml").getroot()
+except Exception:
+    sys.exit(1)
+if root.tag == "testsuites":
+    suites = list(root.findall("testsuite"))
+else:
+    suites = [root]
+failures = 0
+errors = 0
+for suite in suites:
+    failures += int(suite.attrib.get("failures", 0) or 0)
+    errors += int(suite.attrib.get("errors", 0) or 0)
+sys.exit(0 if (failures == 0 and errors == 0) else 1)
+PY
+              then
+                echo "pytest exited with $status but junit reports no failures/errors; overriding exit status to 0."
+                status=0
+              fi
+            fi
+            if [ "$status" -eq 4 ] || [ "$status" -eq 5 ]; then
+              echo "No tests collected; skipping image comparison."
+              status=0
+            fi
+            exit "$status"
           fi
 
       # Return the html output of the comparison even if failed

ultraplot/figure.py

@@ -2517,18 +2517,23 @@ def _align_super_title(self, renderer):
         ha = self._suptitle.get_ha()
         va = self._suptitle.get_va()
 
-        # Use original centering algorithm for positioning (regardless of alignment)
+        # Use original centering algorithm for horizontal positioning.
         x, _ = self._get_align_coord(
             "top",
             axs,
             includepanels=self._includepanels,
             align=ha,
         )
-        y = self._get_offset_coord("top", axs, renderer, pad=pad, extra=labs)
+        y_target = self._get_offset_coord("top", axs, renderer, pad=pad, extra=labs)
 
-        # Set final position and alignment on the suptitle
+        # Place suptitle so its *bbox bottom* sits at the target offset.
+        # This preserves spacing for all vertical alignments (e.g. va='top').
         self._suptitle.set_ha(ha)
         self._suptitle.set_va(va)
+        self._suptitle.set_position((x, 0))
+        bbox = self._suptitle.get_window_extent(renderer)
+        y_bbox = self.transFigure.inverted().transform((0, bbox.ymin))[1]
+        y = y_target - y_bbox
         self._suptitle.set_position((x, y))
 
     def _update_axis_label(self, side, axs):

ultraplot/tests/test_figure.py

@@ -403,6 +403,31 @@ def test_explicit_sharey_propagates_scale_changes():
 
     assert axs[0].get_yscale() == "log"
     assert axs[1].get_yscale() == "log"
+@pytest.mark.parametrize("va", ["bottom", "center", "top"])
+def test_suptitle_vertical_alignment_preserves_top_spacing(va):
+    """
+    Suptitle vertical alignment should not reduce the spacing above top content.
+    """
+    fig, axs = uplt.subplots(ncols=2)
+    fig.format(
+        suptitle="Long figure title\nsecond line",
+        suptitle_kw={"va": va},
+        toplabels=("left", "right"),
+    )
+    fig.canvas.draw()
+    renderer = fig.canvas.get_renderer()
+
+    axs_top = fig._get_align_axes("top")
+    labs = tuple(t for t in fig._suplabel_dict["top"].values() if t.get_text())
+    pad = (fig._suptitle_pad / 72) / fig.get_size_inches()[1]
+    y_expected = fig._get_offset_coord("top", axs_top, renderer, pad=pad, extra=labs)
+
+    bbox = fig._suptitle.get_window_extent(renderer)
+    y_actual = fig.transFigure.inverted().transform((0, bbox.ymin))[1]
+    y_tol = 1.5 / (fig.dpi * fig.get_size_inches()[1])  # ~1.5 px tolerance
+    assert y_actual >= y_expected - y_tol
+
+    uplt.close("all")
 
 
 def test_subplots_pixelsnap_aligns_axes_bounds():

ultraplot/tests/test_subplots.py

@@ -689,7 +689,7 @@ def test_non_rectangular_outside_labels_top():
     uplt.close(fig)
 
 
-@pytest.mark.mpl_image_compare
+@pytest.mark.mpl_image_compare(tolerance=4)
 def test_outside_labels_with_panels():
     fig, ax = uplt.subplots(
         ncols=2,