Merge branch 'main' into feat/curved-text

Author: cvanelteren

.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."

.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
 

docs/2dplots.py

@@ -344,6 +344,7 @@
 ax.pcolormesh(data, cmap="magma", colorbar="b")
 ax = fig.subplot(gs[1], title="Logarithmic normalizer with norm='log'")
 ax.pcolormesh(data, cmap="magma", norm="log", colorbar="b")
+fig.show()
 
 
 # %% [raw] raw_mimetype="text/restructuredtext"
@@ -431,6 +432,7 @@
         ax.colorbar(m, loc="b")
         ax.format(title=f"{mode.title()}-skewed + {fair} scaling")
         i += 1
+fig.show()
 
 # %% [raw] raw_mimetype="text/restructuredtext"
 # .. _ug_discrete:
@@ -531,6 +533,7 @@
         colorbar="b",
         colorbar_kw={"locator": 180},
     )
+fig.show()
 
 # %% [raw] raw_mimetype="text/restructuredtext" tags=[]
 # .. _ug_autonorm:

docs/basics.py

@@ -86,6 +86,7 @@
 # fig = uplt.figure(suptitle='Single subplot')  # equivalent to above
 # ax = fig.subplot(xlabel='x axis', ylabel='y axis')
 ax.plot(data, lw=2)
+fig.show()
 
 
 # %% [raw] raw_mimetype="text/restructuredtext"
@@ -184,6 +185,7 @@
     ylabel="ylabel",
 )
 axs[2].plot(data, lw=2)
+fig.show()
 # fig.save('~/example2.png')  # save the figure
 # fig.savefig('~/example2.png')  # alternative
 
@@ -301,6 +303,7 @@
 axs[1, :1].format(fc="sky blue")
 axs[-1, -1].format(fc="gray4", grid=False)
 axs[0].plot((state.rand(50, 10) - 0.5).cumsum(axis=0), cycle="Grays_r", lw=2)
+fig.show()
 
 
 # %% [raw] raw_mimetype="text/restructuredtext"
@@ -361,6 +364,7 @@
     suptitle="Quick plotting demo",
 )
 fig.colorbar(m, loc="b", label="label")
+fig.show()
 
 
 # %% [raw] raw_mimetype="text/restructuredtext"
@@ -565,3 +569,4 @@
 for ax, style in zip(axs, styles):
     ax.format(style=style, xlabel="xlabel", ylabel="ylabel", title=style)
     ax.plot(data, linewidth=3)
+fig.show()

docs/conf.py

@@ -13,6 +13,7 @@
 
 # Import statements
 import datetime
+import logging
 import os
 import re
 import subprocess
@@ -78,18 +79,25 @@ def __getattr__(self, name):
 except Exception:
     pass
 
+# Silence font discovery warnings like "findfont: Font family ..."
+for _logger_name in ("matplotlib", "matplotlib.font_manager"):
+    _logger = logging.getLogger(_logger_name)
+    _logger.setLevel(logging.ERROR)
+    _logger.propagate = False
+
 # Suppress deprecated rc key warnings from local configs during docs builds.
 try:
     from ultraplot.internals.warnings import UltraPlotWarning
 
+    warnings.filterwarnings("ignore")
     warnings.filterwarnings(
         "ignore",
-        message=r"The rc setting 'colorbar.rasterize' was deprecated.*",
         category=UltraPlotWarning,
     )
 except Exception:
     pass
 
+
 # Print available system fonts
 from matplotlib.font_manager import fontManager
 from sphinx_gallery.sorting import ExplicitOrder, FileNameSortKey
@@ -103,6 +111,10 @@ def _reset_ultraplot(gallery_conf, fname):
         import ultraplot as uplt
     except Exception:
         return
+    for _logger_name in ("matplotlib", "matplotlib.font_manager"):
+        _logger = logging.getLogger(_logger_name)
+        _logger.setLevel(logging.ERROR)
+        _logger.propagate = False
     uplt.rc.reset()
 
 
@@ -349,6 +361,9 @@ def _reset_ultraplot(gallery_conf, fname):
 
 nbsphinx_execute = "auto"
 
+# Suppress warnings in nbsphinx kernels without injecting visible cells.
+os.environ["PYTHONWARNINGS"] = "ignore"
+
 # Sphinx gallery configuration
 sphinx_gallery_conf = {
     "doc_module": ("ultraplot",),

docs/stats.py

@@ -428,7 +428,7 @@
 mean_temps = [14.0, 14.2, 14.5, 15.0, 15.5]  # warming trend
 data = [state.normal(temp, 0.8, 500) for temp in mean_temps]
 
-fig, axs = uplt.subplots(ncols=2, figsize=(11, 5))
+fig, axs = uplt.subplots(ncols=2, share=0)
 axs.format(abc="A.", abcloc="ul", suptitle="Categorical vs Continuous positioning")
 
 # Categorical positioning (default)

ultraplot/axes/base.py

@@ -3824,7 +3824,7 @@ def text(
         bordercolor="w",
         borderwidth=2,
         borderinvert=False,
-        borderstyle="miter",
+        borderstyle=None,
         bboxcolor="w",
         bboxstyle="round",
         bboxalpha=0.5,
@@ -3854,7 +3854,7 @@ def text(
             The color of the text border.
         borderinvert : bool, optional
             If ``True``, the text and border colors are swapped.
-        borderstyle : {'miter', 'round', 'bevel'}, optional
+        borderstyle : {'miter', 'round', 'bevel'}, default: :rc:`text.borderstyle`
             The `line join style \\
 <https://matplotlib.org/stable/gallery/lines_bars_and_markers/joinstyle.html>`__
             used for the border.
@@ -3901,6 +3901,7 @@ def text(
             kwargs.update(_pop_props(kwargs, "text"))
 
         # Update the text object using a monkey patch
+        borderstyle = _not_none(borderstyle, rc["text.borderstyle"])
         obj = func(*args, transform=transform, **kwargs)
         obj.update = labels._update_label.__get__(obj)
         obj.update(
@@ -4629,7 +4630,7 @@ def _apply_inset_colorbar_layout(
         "inset": bounds_inset,
         "frame": bounds_frame,
     }
-    if frame is not None:
+    if frame is not None and hasattr(frame, "set_bounds"):
         frame.set_bounds(*bounds_frame)
 
 

ultraplot/axes/plot.py

@@ -6525,7 +6525,7 @@ def _apply_ridgeline(
         else:
             # Categorical (evenly-spaced) positioning mode
             max_height = max(y.max() for x, y in ridges)
-            spacing = max_height * (1 + overlap)
+            spacing = max(0.0, 1 - overlap)
 
         artists = []
         # Base zorder for ridgelines - use a high value to ensure they're on top
@@ -6544,7 +6544,7 @@ def _apply_ridgeline(
                 y_plot = y_scaled + offset
             else:
                 # Categorical mode: normalize and space evenly
-                y_normalized = y / max_height
+                y_normalized = y / max_height if max_height > 0 else y
                 offset = i * spacing
                 y_plot = y_normalized + offset
 

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

ultraplot/gridspec.py

@@ -1163,7 +1163,27 @@ def _get_tight_space(self, w):
                 x1 = max(ax._range_tightbbox(x)[1] for ax in group1)
                 x2 = min(ax._range_tightbbox(x)[0] for ax in group2)
                 margins.append((x2 - x1) / self.figure.dpi)
-            s = 0 if not margins else max(0, s - min(margins) + p)
+            if not margins:
+                s = 0
+            else:
+                s = max(0, s - min(margins) + p)
+                # Keep at least the pad when adjacent axes exist.
+                if s == 0 and p:
+                    s = p
+                # Ensure enough space for inner-side labels/ticks on the right axes.
+                if w == "w":
+                    figwidth = self.figure.get_size_inches()[0]
+                    left_margins = []
+                    for _, group2 in groups:
+                        for ax in group2:
+                            bbox = getattr(ax, "_tight_bbox", None)
+                            if bbox is None:
+                                continue
+                            x0 = ax.get_position().x0 * figwidth
+                            left_margins.append(max(0.0, x0 - bbox.xmin))
+                    if left_margins:
+                        extra_pad = 0.5 * self._labelspace / 72
+                        s = max(s, max(left_margins) + p + extra_pad)
             space[i] = s
 
         return space