Merge branch 'main' into refactor/ultra-colorbar

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
 

.pre-commit-config.yaml

@@ -11,6 +11,6 @@ ci:
 
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.12.0
+    rev: 26.1.0
     hooks:
       - id: black

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/sphinxext/custom_roles.py

@@ -2,6 +2,7 @@
 """
 Custom :rc: and :rcraw: roles for rc settings.
 """
+
 import os
 
 from docutils import nodes

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/__init__.py

@@ -2,6 +2,7 @@
 """
 A succinct matplotlib wrapper for making beautiful, publication-quality graphics.
 """
+
 from __future__ import annotations
 
 import sys

ultraplot/_lazy.py

@@ -2,6 +2,7 @@
 """
 Helpers for lazy attribute loading in :mod:`ultraplot`.
 """
+
 from __future__ import annotations
 
 import ast