Merge branch 'main' into feat/ridgeline-histtype

cvanelteren · web-flow · commit ca64ad37c6e1 · 2026-02-07T10:15:13.000+10:00
diff --git a/.github/workflows/build-ultraplot.yml b/.github/workflows/build-ultraplot.yml
@@ -135,7 +135,22 @@ jobs:
           echo "TEST_NODEIDS=${TEST_NODEIDS}"
           # Save PR-selected nodeids for reuse after checkout (if provided)
           if [ "${TEST_MODE}" = "selected" ] && [ -n "${TEST_NODEIDS}" ]; then
-            printf "%s\n" ${TEST_NODEIDS} > /tmp/pr_selected_nodeids.txt
+            python -c 'import json, os
+raw = os.environ.get("TEST_NODEIDS", "").strip()
+nodeids = []
+if raw and raw != "[]":
+    try:
+        parsed = json.loads(raw)
+    except json.JSONDecodeError:
+        parsed = raw.split()
+    if isinstance(parsed, str):
+        parsed = [parsed]
+    if isinstance(parsed, list):
+        nodeids = [item for item in parsed if isinstance(item, str) and item]
+with open("/tmp/pr_selected_nodeids.txt", "w", encoding="utf-8") as fh:
+    for nodeid in nodeids:
+        fh.write(f"{nodeid}\n")
+print(f"Selected nodeids parsed: {len(nodeids)}")'
           else
             : > /tmp/pr_selected_nodeids.txt
           fi
@@ -152,26 +167,22 @@ jobs:
           python -c "import ultraplot as plt; plt.config.Configurator()._save_yaml('ultraplot.yml')"
           if [ "${TEST_MODE}" = "selected" ] && [ -s /tmp/pr_selected_nodeids.txt ]; then
             status=0
-            filter_nodeids() {
-              local filtered=""
-              for nodeid in $(cat /tmp/pr_selected_nodeids.txt); do
-                local path="${nodeid%%::*}"
-                if [ -f "$path" ]; then
-                  filtered="${filtered} ${nodeid}"
-                fi
-              done
-              echo "${filtered}"
-            }
-            FILTERED_NODEIDS="$(filter_nodeids)"
-            echo "FILTERED_NODEIDS_BASE=${FILTERED_NODEIDS}"
-            if [ -z "${FILTERED_NODEIDS}" ]; then
+            mapfile -t FILTERED_NODEIDS < <(
+              while IFS= read -r nodeid; do
+                [ -z "$nodeid" ] && continue
+                path="${nodeid%%::*}"
+                [ -f "$path" ] && printf '%s\n' "$nodeid"
+              done < /tmp/pr_selected_nodeids.txt
+            )
+            echo "FILTERED_NODEIDS_BASE_COUNT=${#FILTERED_NODEIDS[@]}"
+            if [ "${#FILTERED_NODEIDS[@]}" -eq 0 ]; then
               echo "No valid nodeids found on base; skipping baseline generation."
             else
               echo "=== Memory before baseline generation ===" && free -h
               pytest -n ${PYTEST_WORKERS} --dist loadfile --tb=short --disable-warnings -W ignore \
                 --mpl-generate-path=./ultraplot/tests/baseline/ \
                 --mpl-default-style="./ultraplot.yml" \
-                ${FILTERED_NODEIDS} || status=$?
+                "${FILTERED_NODEIDS[@]}" || status=$?
               echo "=== Memory after baseline generation ===" && free -h
               if [ "$status" -eq 4 ] || [ "$status" -eq 5 ]; then
                 echo "No tests collected from selected nodeids on base; skipping baseline generation."
@@ -213,19 +224,15 @@ jobs:
           echo "TEST_NODEIDS=${TEST_NODEIDS}"
           if [ "${TEST_MODE}" = "selected" ] && [ -s /tmp/pr_selected_nodeids.txt ]; then
             status=0
-            filter_nodeids() {
-              local filtered=""
-              for nodeid in $(cat /tmp/pr_selected_nodeids.txt); do
-                local path="${nodeid%%::*}"
-                if [ -f "$path" ]; then
-                  filtered="${filtered} ${nodeid}"
-                fi
-              done
-              echo "${filtered}"
-            }
-            FILTERED_NODEIDS="$(filter_nodeids)"
-            echo "FILTERED_NODEIDS_PR=${FILTERED_NODEIDS}"
-            if [ -z "${FILTERED_NODEIDS}" ]; then
+            mapfile -t FILTERED_NODEIDS < <(
+              while IFS= read -r nodeid; do
+                [ -z "$nodeid" ] && continue
+                path="${nodeid%%::*}"
+                [ -f "$path" ] && printf '%s\n' "$nodeid"
+              done < /tmp/pr_selected_nodeids.txt
+            )
+            echo "FILTERED_NODEIDS_PR_COUNT=${#FILTERED_NODEIDS[@]}"
+            if [ "${#FILTERED_NODEIDS[@]}" -eq 0 ]; then
               echo "No valid nodeids found on PR branch; skipping image comparison."
               exit 0
             else
@@ -236,7 +243,7 @@ jobs:
               --mpl-results-path=./results/ \
               --mpl-generate-summary=html \
               --mpl-default-style="./ultraplot.yml" \
-              ${FILTERED_NODEIDS} || status=$?
+              "${FILTERED_NODEIDS[@]}" || status=$?
               echo "=== Memory after image comparison ===" && free -h
               if [ "$status" -eq 4 ] || [ "$status" -eq 5 ]; then
                 echo "No tests collected from selected nodeids; skipping image comparison."
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -74,7 +74,7 @@ jobs:
         run: |
           if [ "${{ github.event_name }}" != "pull_request" ]; then
             echo "mode=full" >> $GITHUB_OUTPUT
-            echo "tests=" >> $GITHUB_OUTPUT
+            echo "tests=[]" >> $GITHUB_OUTPUT
             exit 0
           fi
 
@@ -104,7 +104,7 @@ jobs:
           import json
           data = json.load(open(".ci/selection.json", "r", encoding="utf-8"))
           print(f"mode={data['mode']}")
-          print("tests=" + " ".join(data.get("tests", [])))
+          print("tests=" + json.dumps(data.get("tests", []), separators=(",", ":")))
           PY
           cat .ci/selection.out >> $GITHUB_OUTPUT
 
diff --git a/ultraplot/figure.py b/ultraplot/figure.py
@@ -869,6 +869,7 @@ def __init__(
 
     @override
     def draw(self, renderer):
+        self._snap_axes_to_pixel_grid(renderer)
         # implement the tick sharing here
         # should be shareable --> either all cartesian or all geographic
         # but no mixing (panels can be mixed)
@@ -880,6 +881,53 @@ def draw(self, renderer):
         self._apply_share_label_groups()
         super().draw(renderer)
 
+    def _snap_axes_to_pixel_grid(self, renderer) -> None:
+        """
+        Snap visible axes bounds to the renderer pixel grid.
+        """
+        if not rc.find("subplots.pixelsnap", context=True):
+            return
+
+        width = getattr(renderer, "width", None)
+        height = getattr(renderer, "height", None)
+        if not width or not height:
+            return
+
+        width = float(width)
+        height = float(height)
+        if width <= 0 or height <= 0:
+            return
+
+        invw = 1.0 / width
+        invh = 1.0 / height
+        minw = invw
+        minh = invh
+
+        for ax in self._iter_axes(hidden=False, children=False, panels=True):
+            bbox = ax.get_position(original=False)
+            old = np.array([bbox.x0, bbox.y0, bbox.x1, bbox.y1], dtype=float)
+            new = np.array(
+                [
+                    round(old[0] * width) * invw,
+                    round(old[1] * height) * invh,
+                    round(old[2] * width) * invw,
+                    round(old[3] * height) * invh,
+                ],
+                dtype=float,
+            )
+
+            if new[2] <= new[0]:
+                new[2] = new[0] + minw
+            if new[3] <= new[1]:
+                new[3] = new[1] + minh
+
+            if np.allclose(new, old, rtol=0.0, atol=1e-12):
+                continue
+            ax.set_position(
+                [new[0], new[1], new[2] - new[0], new[3] - new[1]],
+                which="both",
+            )
+
     def _share_ticklabels(self, *, axis: str) -> None:
         """
         Tick label sharing is determined at the figure level. While
diff --git a/ultraplot/internals/rcsetup.py b/ultraplot/internals/rcsetup.py
@@ -2099,6 +2099,11 @@ def copy(self):
         _validate_bool,
         "Whether to auto-adjust the subplot spaces and figure margins.",
     ),
+    "subplots.pixelsnap": (
+        False,
+        _validate_bool,
+        "Whether to snap subplot bounds to the renderer pixel grid during draw.",
+    ),
     # Super title settings
     "suptitle.color": (BLACK, _validate_color, "Figure title color."),
     "suptitle.pad": (
diff --git a/ultraplot/tests/conftest.py b/ultraplot/tests/conftest.py
@@ -37,6 +37,8 @@ def close_figures_after_test(request):
     # Start from a clean rc state.
     uplt.rc._context.clear()
     uplt.rc.reset(local=False, user=False, default=True)
+    if request.node.get_closest_marker("mpl_image_compare"):
+        uplt.rc["subplots.pixelsnap"] = True
 
     yield
     uplt.close("all")
diff --git a/ultraplot/tests/test_figure.py b/ultraplot/tests/test_figure.py
@@ -297,3 +297,21 @@ def test_suptitle_kw_position_reverted(ha, expectation):
     assert np.isclose(x, expectation, atol=0.1), f"Expected x={expectation}, got {x=}"
 
     uplt.close("all")
+
+
+def test_subplots_pixelsnap_aligns_axes_bounds():
+    with uplt.rc.context({"subplots.pixelsnap": True}):
+        fig, axs = uplt.subplots(ncols=2, nrows=2)
+        axs.plot([0, 1], [0, 1])
+        fig.canvas.draw()
+
+        renderer = fig._get_renderer()
+        width = float(renderer.width)
+        height = float(renderer.height)
+
+        for ax in axs:
+            bbox = ax.get_position(original=False)
+            coords = np.array(
+                [bbox.x0 * width, bbox.y0 * height, bbox.x1 * width, bbox.y1 * height]
+            )
+            assert np.allclose(coords, np.round(coords), atol=1e-8)
