ultraplot 2.1.5__tar.gz → 2.1.9__tar.gz

{ultraplot-2.1.5 → ultraplot-2.1.9}/.github/workflows/build-ultraplot.yml

@@ -53,7 +53,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: mamba-org/setup-micromamba@v2.0.7
+      - uses: mamba-org/setup-micromamba@v3.0.0
         with:
           environment-file: ./environment.yml
           init-shell: bash
@@ -100,7 +100,7 @@ jobs:
 
       - uses: actions/checkout@v6
 
-      - uses: mamba-org/setup-micromamba@v2.0.7
+      - uses: mamba-org/setup-micromamba@v3.0.0
         with:
           environment-file: ./environment.yml
           init-shell: bash

{ultraplot-2.1.5 → ultraplot-2.1.9}/.github/workflows/main.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Build test map on cache miss
         if: steps.restore-map.outputs.cache-hit != 'true'
-        uses: mamba-org/setup-micromamba@v2.0.7
+        uses: mamba-org/setup-micromamba@v3.0.0
         with:
           environment-file: ./environment.yml
           init-shell: bash
@@ -157,7 +157,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: mamba-org/setup-micromamba@v2.0.7
+      - uses: mamba-org/setup-micromamba@v3.0.0
         with:
           environment-file: ./environment.yml
           init-shell: bash
@@ -182,7 +182,7 @@ jobs:
             ultraplot/tests
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

{ultraplot-2.1.5 → ultraplot-2.1.9}/.github/workflows/publish-pypi.yml

@@ -1,11 +1,13 @@
 name: Publish to PyPI
+
 on:
   pull_request:
   push:
-    tags: ["v*"]
+    tags:
+      - "v*"
 
 concurrency:
-  group: publish-pypi-{{ github.sha }}
+  group: publish-pypi-${{ github.sha }}
   cancel-in-progress: false
 
 jobs:
@@ -17,22 +19,25 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get tags
-        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-        shell: bash
-
       - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
 
+      - name: Ensure clean tree before build
+        run: |
+          git diff --quiet || (git status --short && git diff && exit 1)
+        shell: bash
+
       - name: Build package
         run: |
-          python -m pip install --upgrade pip wheel setuptools setuptools_scm build twine
+          python -m pip install --upgrade pip
+          python -m pip install wheel setuptools setuptools_scm build twine
           python -m build --sdist --wheel . --outdir dist
+        shell: bash
 
       - name: Check files
         run: |
-          ls dist
+          ls -lah dist
         shell: bash
 
       - name: Test wheels
@@ -78,7 +83,7 @@ jobs:
 
       - name: Check files
         run: |
-          ls dist
+          ls -lah dist
         shell: bash
 
       - name: Publish to TestPyPI
@@ -91,11 +96,11 @@ jobs:
   publish-pypi:
     name: Publish to PyPI
     needs: publish-pypi-test
+    if: github.event_name == 'push'
     environment:
       name: prod
       url: https://pypi.org/project/ultraplot/
     runs-on: ubuntu-latest
-    if: github.event_name == 'push'
     permissions:
       id-token: write
       contents: read
@@ -108,7 +113,7 @@ jobs:
 
       - name: Check files
         run: |
-          ls dist
+          ls -lah dist
         shell: bash
 
       - name: Publish to PyPI
@@ -141,6 +146,8 @@ jobs:
       ZENODO_ACCESS_TOKEN: ${{ secrets.ZENODO_ACCESS_TOKEN }}
     steps:
       - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
       - uses: actions/setup-python@v6
         with:
@@ -148,7 +155,8 @@ jobs:
 
       - name: Install release tooling
         run: |
-          python -m pip install --upgrade pip PyYAML
+          python -m pip install --upgrade pip
+          python -m pip install PyYAML
         shell: bash
 
       - name: Download artifacts
@@ -157,7 +165,21 @@ jobs:
           name: dist-${{ github.sha }}-${{ github.run_id }}-${{ github.run_number }}
           path: dist
 
+      - name: Generate release citation metadata
+        run: |
+          python tools/release/sync_citation.py \
+            --tag "${GITHUB_REF_NAME}" \
+            --output "${RUNNER_TEMP}/CITATION.cff"
+        shell: bash
+
+      - name: Check tree stayed clean
+        run: |
+          git diff --quiet || (git status --short && git diff && exit 1)
+        shell: bash
+
       - name: Publish to Zenodo
         run: |
-          python tools/release/publish_zenodo.py --dist-dir dist
+          python tools/release/publish_zenodo.py \
+            --dist-dir dist \
+            --citation-file "${RUNNER_TEMP}/CITATION.cff"
         shell: bash

{ultraplot-2.1.5 → ultraplot-2.1.9}/.github/workflows/test-map.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: mamba-org/setup-micromamba@v2.0.7
+      - uses: mamba-org/setup-micromamba@v3.0.0
         with:
           environment-file: ./environment.yml
           init-shell: bash
@@ -48,7 +48,7 @@ jobs:
           python tools/ci/build_test_map.py --coverage-file .coverage --output .ci/test-map.json --root .
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

{ultraplot-2.1.5 → ultraplot-2.1.9}/.pre-commit-config.yaml

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

{ultraplot-2.1.5 → ultraplot-2.1.9}/CITATION.cff

@@ -8,8 +8,8 @@ authors:
   - family-names: "Becker"
     given-names: "Matthew R."
     orcid: "https://orcid.org/0000-0001-7774-2246"
-date-released: "2026-03-11"
-version: "2.1.3"
+date-released: "2026-03-30"
+version: "2.1.5"
 doi: "10.5281/zenodo.15733564"
 repository-code: "https://github.com/Ultraplot/UltraPlot"
 license: "MIT"

{ultraplot-2.1.5/ultraplot.egg-info → ultraplot-2.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultraplot
-Version: 2.1.5
+Version: 2.1.9
 Summary: A succinct matplotlib wrapper for making beautiful, publication-quality graphics.
 Author-email: Casper van Elteren <caspervanelteren@gmail.com>, Luke Davis <lukelbd@gmail.com>
 Maintainer-email: Casper van Elteren <caspervanelteren@gmail.com>, "Matthew R. Becker" <becker.mr@gmail.com>

{ultraplot-2.1.5 → ultraplot-2.1.9}/tools/release/publish_zenodo.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 import argparse
 import json
-import mimetypes
 import os
 import sys
 from pathlib import Path
@@ -43,6 +42,12 @@ def parse_args() -> argparse.Namespace:
         default=Path("CITATION.cff"),
         help="Path to the repository CITATION.cff file.",
     )
+    parser.add_argument(
+        "--citation-file",
+        type=Path,
+        default=Path("CITATION.cff"),
+        help="Path to the citation metadata file to upload.",
+    )
     parser.add_argument(
         "--pyproject",
         type=Path,
@@ -244,14 +249,15 @@ def upload_dist_files(draft: dict, token: str, dist_dir: Path) -> None:
     for path in sorted(dist_dir.iterdir()):
         if not path.is_file():
             continue
-        content_type = mimetypes.guess_type(path.name)[0] or "application/octet-stream"
         with path.open("rb") as handle:
             api_request(
                 "PUT",
                 f"{bucket_url}/{parse.quote(path.name)}",
                 token=token,
                 data=handle.read(),
-                content_type=content_type,
+                # Zenodo bucket uploads reject extension-specific types like
+                # application/gzip for source tarballs and require raw bytes.
+                content_type="application/octet-stream",
             )
         print(f"Uploaded {path.name} to Zenodo draft {draft['id']}.")
 

ultraplot-2.1.9/tools/release/sync_citation.py

@@ -0,0 +1,168 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import argparse
+import re
+import subprocess
+from pathlib import Path
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        description="Sync CITATION.cff release metadata from a git tag."
+    )
+    parser.add_argument(
+        "--tag",
+        required=True,
+        help="Release tag to sync from, for example v2.1.5 or refs/tags/v2.1.5.",
+    )
+    parser.add_argument(
+        "--citation",
+        type=Path,
+        default=Path("CITATION.cff"),
+        help="Path to the source CITATION.cff file.",
+    )
+    parser.add_argument(
+        "--output",
+        type=Path,
+        default=None,
+        help=(
+            "Optional output path for the synced citation file. "
+            "Defaults to overwriting --citation."
+        ),
+    )
+    parser.add_argument(
+        "--date",
+        help="Explicit release date in YYYY-MM-DD format. Defaults to the git tag date.",
+    )
+    parser.add_argument(
+        "--check",
+        action="store_true",
+        help="Validate the file contents instead of writing them.",
+    )
+    return parser.parse_args()
+
+
+def normalize_tag(tag: str) -> str:
+    return tag.strip().removeprefix("refs/tags/")
+
+
+def tag_version(tag: str) -> str:
+    tag = normalize_tag(tag)
+    if not tag.startswith("v"):
+        raise ValueError(f"Release tag must start with 'v', got {tag!r}.")
+    return tag.removeprefix("v")
+
+
+def resolve_release_date(tag: str, repo_root: Path) -> str:
+    result = subprocess.run(
+        [
+            "git",
+            "for-each-ref",
+            f"refs/tags/{normalize_tag(tag)}",
+            "--format=%(creatordate:short)",
+        ],
+        check=True,
+        cwd=repo_root,
+        capture_output=True,
+        text=True,
+    )
+    value = result.stdout.strip()
+    if not value:
+        raise ValueError(f"Could not resolve a release date for tag {tag!r}.")
+    return value
+
+
+def replace_scalar(text: str, key: str, value: str) -> str:
+    pattern = rf'^(?P<prefix>{re.escape(key)}:\s*)"[^"]*"\s*$'
+    updated, count = re.subn(
+        pattern,
+        rf'\g<prefix>"{value}"',
+        text,
+        count=1,
+        flags=re.MULTILINE,
+    )
+    if count != 1:
+        raise ValueError(f"Missing quoted scalar {key!r} in CITATION metadata.")
+    return updated
+
+
+def build_synced_citation(
+    citation_path: Path,
+    *,
+    tag: str,
+    release_date: str | None = None,
+    repo_root: Path | None = None,
+) -> tuple[str, str, bool]:
+    repo_root = repo_root or citation_path.resolve().parent
+    version = tag_version(tag)
+    release_date = release_date or resolve_release_date(tag, repo_root)
+
+    original = citation_path.read_text(encoding="utf-8")
+    updated = replace_scalar(original, "version", version)
+    updated = replace_scalar(updated, "date-released", release_date)
+    changed = updated != original
+    return original, updated, changed
+
+
+def sync_citation(
+    citation_path: Path,
+    *,
+    tag: str,
+    output_path: Path | None = None,
+    release_date: str | None = None,
+    repo_root: Path | None = None,
+    check: bool = False,
+) -> bool:
+    original, updated, changed = build_synced_citation(
+        citation_path,
+        tag=tag,
+        release_date=release_date,
+        repo_root=repo_root,
+    )
+
+    if check:
+        if changed:
+            raise SystemExit(
+                f"{citation_path} is out of date for {normalize_tag(tag)}. "
+                "Run tools/release/sync_citation.py before releasing."
+            )
+        return False
+
+    destination = output_path or citation_path
+    destination.parent.mkdir(parents=True, exist_ok=True)
+    destination.write_text(updated, encoding="utf-8")
+    return changed
+
+
+def main() -> int:
+    args = parse_args()
+    destination = args.output or args.citation
+
+    changed = sync_citation(
+        args.citation,
+        tag=args.tag,
+        output_path=args.output,
+        release_date=args.date,
+        repo_root=Path.cwd(),
+        check=args.check,
+    )
+
+    if args.check:
+        print(f"Validated {args.citation} for {normalize_tag(args.tag)}.")
+    else:
+        source = args.citation.resolve()
+        dest = destination.resolve()
+        if source == dest:
+            print(f"Updated {args.citation} for {normalize_tag(args.tag)}.")
+        else:
+            print(
+                f"Wrote synced citation metadata from {args.citation} "
+                f"to {destination} for {normalize_tag(args.tag)}."
+            )
+
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

ultraplot-2.1.9/ultraplot/_version.py

@@ -0,0 +1 @@
+__version__ = '2.1.9'

{ultraplot-2.1.5 → ultraplot-2.1.9}/ultraplot/axes/base.py

@@ -2459,7 +2459,20 @@ class Axes(_ExternalModeMixin, maxes.Axes):
                 ncols=gs.ncols_total
             )
 
+            # Check if the panel has a span override (spans more columns/rows
+            # than its parent). When it does, use the SubplotSpec position for
+            # the "along" dimension so the span is respected. Otherwise use
+            # parent_bbox which correctly tracks aspect-ratio adjustments.
+            parent_ss = self._panel_parent.get_subplotspec().get_topmost_subplotspec()
+            p_row1, p_row2, p_col1, p_col2 = parent_ss._get_rows_columns(
+                ncols=gs.ncols_total
+            )
+
             if side in ("right", "left"):
+                has_span_override = (row1 < p_row1) or (row2 > p_row2)
+                along_bbox = (
+                    ss.get_position(self.figure) if has_span_override else parent_bbox
+                )
                 boundary = None
                 width = sum(gs._wratios_total[col1 : col2 + 1]) / figwidth
                 if a_col2 < col1:
@@ -2480,9 +2493,13 @@ class Axes(_ExternalModeMixin, maxes.Axes):
                 else:
                     x0 = anchor_bbox.x0 - pad - width
                 bbox = mtransforms.Bbox.from_bounds(
-                    x0, parent_bbox.y0, width, parent_bbox.height
+                    x0, along_bbox.y0, width, along_bbox.height
                 )
             else:
+                has_span_override = (col1 < p_col1) or (col2 > p_col2)
+                along_bbox = (
+                    ss.get_position(self.figure) if has_span_override else parent_bbox
+                )
                 boundary = None
                 height = sum(gs._hratios_total[row1 : row2 + 1]) / figheight
                 if a_row2 < row1:
@@ -2502,7 +2519,7 @@ class Axes(_ExternalModeMixin, maxes.Axes):
                 else:
                     y0 = anchor_bbox.y0 - pad - height
                 bbox = mtransforms.Bbox.from_bounds(
-                    parent_bbox.x0, y0, parent_bbox.width, height
+                    along_bbox.x0, y0, along_bbox.width, height
                 )
             setter(bbox)
 
@@ -3191,13 +3208,31 @@ class Axes(_ExternalModeMixin, maxes.Axes):
         # Perform extra post-processing steps
         # NOTE: This should be updated alongside draw(). We also cache the resulting
         # bounding box to speed up tight layout calculations (see _range_tightbbox).
+        include_subset_titles = kwargs.pop("include_subset_titles", True)
         self._add_queued_guides()
         self._apply_title_above()
         if self._colorbar_fill:
             self._colorbar_fill.update_ticks(manual_only=True)  # only if needed
         if self._inset_parent is not None and self._inset_zoom:
             self.indicate_inset_zoom()
-        self._tight_bbox = super().get_tightbbox(renderer, *args, **kwargs)
+        bbox = super().get_tightbbox(renderer, *args, **kwargs)
+        fig = self.figure
+        if (
+            bbox is not None
+            and fig is not None
+            and self._panel_parent is None
+            and include_subset_titles
+            and hasattr(fig, "_get_subset_title_bbox")
+        ):
+            title_bbox = fig._get_subset_title_bbox(self, renderer)
+            if title_bbox is not None:
+                bbox = mtransforms.Bbox.from_extents(
+                    bbox.xmin,
+                    min(bbox.ymin, title_bbox.ymin),
+                    bbox.xmax,
+                    max(bbox.ymax, title_bbox.ymax),
+                )
+        self._tight_bbox = bbox
         return self._tight_bbox
 
     def get_default_bbox_extra_artists(self):

{ultraplot-2.1.5 → ultraplot-2.1.9}/ultraplot/axes/plot.py

@@ -193,6 +193,8 @@ linewidth : float or 2D array, optional
     Width of streamlines.
 cmap, norm : optional
     Colormap and normalization for array colors.
+colorbar, colorbar_kw : optional
+    Add a colorbar for array-valued streamline colors.
 arrowsize : float, optional
     Arrow size scaling.
 arrowstyle : str, optional
@@ -1918,6 +1920,8 @@ class PlotAxes(base.Axes):
         grains: Optional[int] = None,
         density: Optional[int] = None,
         arrow_at_end: Optional[bool] = None,
+        colorbar: Optional[str] = None,
+        colorbar_kw: Optional[dict[str, Any]] = None,
     ):
         """
         %(plot.curved_quiver)s
@@ -1935,6 +1939,7 @@ class PlotAxes(base.Axes):
         zorder = _not_none(zorder, mlines.Line2D.zorder)
         transform = _not_none(transform, self.transData)
         color = _not_none(color, self._get_lines.get_next_color())
+        colorbar_kw = colorbar_kw or {}
         linewidth = _not_none(linewidth, rc["lines.linewidth"])
         scale = _not_none(scale, rc["curved_quiver.scale"])
         grains = _not_none(grains, rc["curved_quiver.grains"])
@@ -1968,6 +1973,7 @@ class PlotAxes(base.Axes):
                 raise ValueError(
                     "If 'linewidth' is given, must have the shape of 'Grid(x,y)'"
                 )
+            linewidth = np.ma.masked_invalid(linewidth)
             line_kw["linewidth"] = []
         else:
             line_kw["linewidth"] = linewidth
@@ -1990,7 +1996,6 @@ class PlotAxes(base.Axes):
 
         integrate = solver.get_integrator(u, v, minlength, resolution, magnitude)
         trajectories = []
-        edges = []
 
         if start_points is None:
             start_points = solver.gen_starting_points(x, y, grains)
@@ -2026,18 +2031,19 @@ class PlotAxes(base.Axes):
 
         for xs, ys in sp2:
             xg, yg = solver.domain_map.data2grid(xs, ys)
-            t = integrate(xg, yg)
-            if t is not None:
-                trajectories.append(t[0])
-                edges.append(t[1])
+            trajectory = integrate(xg, yg)
+            if trajectory is not None:
+                trajectories.append(trajectory)
         streamlines = []
         arrows = []
-        for t, edge in zip(trajectories, edges):
-            tgx = np.array(t[0])
-            tgy = np.array(t[1])
+        for trajectory in trajectories:
+            tgx = np.array(trajectory.x)
+            tgy = np.array(trajectory.y)
 
             # Rescale from grid-coordinates to data-coordinates.
-            tx, ty = solver.domain_map.grid2data(*np.array(t))
+            tx, ty = solver.domain_map.grid2data(
+                *np.array([trajectory.x, trajectory.y])
+            )
             tx += solver.grid.x_origin
             ty += solver.grid.y_origin
 
@@ -2054,14 +2060,9 @@ class PlotAxes(base.Axes):
                     continue
 
                 arrow_tail = (tx[-1], ty[-1])
-
-                # Extrapolate to find arrow head
-                xg, yg = solver.domain_map.data2grid(
-                    tx[-1] - solver.grid.x_origin, ty[-1] - solver.grid.y_origin
-                )
-
-                ui = solver.interpgrid(u, xg, yg)
-                vi = solver.interpgrid(v, xg, yg)
+                if trajectory.end_direction is None:
+                    continue
+                ui, vi = trajectory.end_direction
 
                 norm_v = np.sqrt(ui**2 + vi**2)
                 if norm_v > 0:
@@ -2087,6 +2088,8 @@ class PlotAxes(base.Axes):
             if isinstance(linewidth, np.ndarray):
                 line_widths = solver.interpgrid(linewidth, tgx, tgy)[:-1]
                 line_kw["linewidth"].extend(line_widths)
+                if np.ma.is_masked(line_widths[n]):
+                    continue
                 arrow_kw["linewidth"] = line_widths[n]
 
             if use_multicolor_lines:
@@ -2094,7 +2097,7 @@ class PlotAxes(base.Axes):
                 line_colors.append(color_values)
                 arrow_kw["color"] = cmap(norm(color_values[n]))
 
-            if not edge:
+            if not trajectory.hit_edge:
                 p = mpatches.FancyArrowPatch(
                     arrow_tail, arrow_head, transform=transform, **arrow_kw
                 )
@@ -2125,6 +2128,12 @@ class PlotAxes(base.Axes):
             lc.set_array(np.ma.hstack(line_colors))
             lc.set_cmap(cmap)
             lc.set_norm(norm)
+            self._update_guide(
+                lc,
+                colorbar=colorbar,
+                colorbar_kw=colorbar_kw,
+                queue_colorbar=False,
+            )
 
         self.add_collection(lc)
         self.autoscale_view()