ultraplot 2.1.5__tar.gz → 2.2.0__tar.gz

{ultraplot-2.1.5 → ultraplot-2.2.0}/.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.2.0}/.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.2.0}/.github/workflows/publish-pypi.yml

@@ -1,11 +1,12 @@
 name: Publish to PyPI
+
 on:
   pull_request:
   push:
     tags: ["v*"]
 
 concurrency:
-  group: publish-pypi-{{ github.sha }}
+  group: publish-pypi-${{ github.sha }}
   cancel-in-progress: false
 
 jobs:
@@ -17,22 +18,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 +82,7 @@ jobs:
 
       - name: Check files
         run: |
-          ls dist
+          ls -lah dist
         shell: bash
 
       - name: Publish to TestPyPI
@@ -91,11 +95,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 +112,7 @@ jobs:
 
       - name: Check files
         run: |
-          ls dist
+          ls -lah dist
         shell: bash
 
       - name: Publish to PyPI
@@ -141,6 +145,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 +154,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 +164,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.2.0}/.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.2.0}/.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.2.0}/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.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultraplot
-Version: 2.1.5
+Version: 2.2.0
 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>
@@ -29,7 +29,7 @@ Provides-Extra: docs
 Requires-Dist: jupyter; extra == "docs"
 Requires-Dist: jupytext; extra == "docs"
 Requires-Dist: lxml-html-clean; extra == "docs"
-Requires-Dist: m2r2; extra == "docs"
+Requires-Dist: markdown; extra == "docs"
 Requires-Dist: mpltern; extra == "docs"
 Requires-Dist: nbsphinx; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"

ultraplot-2.2.0/docs/_scripts/fetch_releases.py

@@ -0,0 +1,154 @@
+"""
+Dynamically build the "What's new?" page from the GitHub releases feed.
+
+The release notes on GitHub are written in Markdown and frequently mix raw
+HTML (``<details><summary>`` blocks wrapping fenced code samples). The
+previous implementation converted the body to RST via ``m2r2``, which left
+the inner Markdown code fences inside ``.. raw:: html`` directives — Sphinx
+then rendered them as literal text. This module instead converts each
+release body to HTML (so fences become ``<pre><code>`` elements) and emits
+a single ``.. raw:: html`` block per release wrapped in a styling hook
+``div.uplt-whats-new-release-body``.
+"""
+
+from __future__ import annotations
+
+import re
+from pathlib import Path
+from typing import Iterable
+
+import markdown
+import requests
+
+GITHUB_REPO = "ultraplot/ultraplot"
+OUTPUT_RST = Path("whats_new.rst")
+GITHUB_API_URL = f"https://api.github.com/repos/{GITHUB_REPO}/releases"
+
+# Markdown extensions: fenced code (for ```python blocks), tables, attribute
+# lists for class hooks, and md_in_html so block-level HTML such as
+# ``<details>`` correctly contains parsed Markdown children.
+_MD_EXTENSIONS = ("fenced_code", "tables", "attr_list", "md_in_html")
+
+# Strip the trailing "by @user in PR_URL" attribution that GitHub auto-adds
+# to release notes. Keep the PR link in parentheses so credit/traceability
+# remains while removing the contributor handles from rendered output.
+# GitHub author handles can include ``[bot]`` suffixes (``@dependabot[bot]``,
+# ``@pre-commit-ci[bot]``); ``\w`` alone misses the brackets.
+_PR_ATTRIBUTION = re.compile(
+    r" by @[\w.\-]+(?:\[bot\])? in (https://github\.com/[^\s]+)"
+)
+
+# Match an ATX heading line, tolerating up-to-3 leading spaces. Authors
+# occasionally indent whole sections by two spaces in the GitHub release
+# editor (e.g. v2.0.1's "### Layout, Rendering, and Geo Improvements"),
+# which python-markdown then parses as a paragraph rather than a heading.
+# We capture the ``#`` run so we can both strip the indent and downgrade
+# one level — the page already provides the H1 ("What's new?") and each
+# release contributes a per-release RST H2, so body headings start at H2.
+_ATX_HEADING = re.compile(r"^[ ]{0,3}(#{1,5})(?=\s)", flags=re.MULTILINE)
+
+
+def _strip_pr_attribution(text: str) -> str:
+    return _PR_ATTRIBUTION.sub(r" (\1)", text)
+
+
+def _downgrade_headings(text: str) -> str:
+    """Demote every Markdown ATX heading by one level (``#`` → ``##``, etc.)."""
+    return _ATX_HEADING.sub(lambda m: "#" + m.group(1), text)
+
+
+def _normalize_unicode(text: str) -> str:
+    return text.replace("→", "->")
+
+
+def _indent_html(html: str, indent: str = "   ") -> str:
+    """Indent every line of ``html`` by ``indent`` for inclusion under ``.. raw:: html``."""
+    return "\n".join(indent + line if line else line for line in html.splitlines())
+
+
+def format_release_body(text: str) -> str:
+    """
+    Convert a GitHub release body (Markdown + embedded HTML) into an RST
+    ``.. raw:: html`` block wrapped in ``div.uplt-whats-new-release-body``.
+
+    Parameters
+    ----------
+    text : str
+        Raw Markdown release body as returned by the GitHub releases API.
+
+    Returns
+    -------
+    str
+        Indented RST snippet ready to be appended to ``whats_new.rst``.
+    """
+    cleaned = _downgrade_headings(
+        _normalize_unicode(_strip_pr_attribution(text or ""))
+    ).strip()
+    html_body = markdown.markdown(cleaned, extensions=list(_MD_EXTENSIONS))
+    wrapped = f'<div class="uplt-whats-new-release-body">\n{html_body}\n</div>'
+    return ".. raw:: html\n\n" + _indent_html(wrapped) + "\n"
+
+
+def _format_release_title(release: dict) -> str:
+    """
+    Build the per-release section title in ``"<tag>: <name>"`` form,
+    de-duplicating the tag if it is already a prefix of the release name.
+    """
+    tag = release["tag_name"].lower()
+    title = (release.get("name") or "").strip()
+    if title.lower().startswith(tag):
+        title = title[len(tag) :].lstrip(" :-—–")
+    return f"{tag}: {title}" if title else tag
+
+
+def fetch_all_releases() -> list[dict]:
+    """Fetch every GitHub release across paginated responses."""
+    releases: list[dict] = []
+    page = 1
+    while True:
+        response = requests.get(GITHUB_API_URL, params={"per_page": 30, "page": page})
+        if response.status_code != 200:
+            print(f"Error fetching releases: {response.status_code}")
+            break
+        page_data = response.json()
+        if not page_data:
+            break
+        releases.extend(page_data)
+        page += 1
+    return releases
+
+
+def _render_releases(releases: Iterable[dict]) -> str:
+    """Render an iterable of release dicts to the full ``whats_new.rst`` body."""
+    header = "What's new?"
+    out = f".. _whats_new:\n\n{header}\n{'=' * len(header)}\n\n"
+    for release in releases:
+        title = _format_release_title(release)
+        date = release["published_at"][:10]
+        heading = f"{title} ({date})"
+        out += f"{heading}\n{'-' * len(heading)}\n\n"
+        out += format_release_body(release.get("body") or "") + "\n"
+    return out
+
+
+def fetch_releases() -> str:
+    """Fetch the latest releases from GitHub and format them as RST."""
+    releases = fetch_all_releases()
+    if not releases:
+        print("Error fetching releases!")
+        return ""
+    return _render_releases(releases)
+
+
+def write_rst() -> None:
+    """Write fetched releases to ``whats_new.rst``."""
+    content = fetch_releases()
+    if content:
+        OUTPUT_RST.write_text(content, encoding="utf-8")
+        print(f"Updated {OUTPUT_RST}")
+    else:
+        print("No updates to write.")
+
+
+if __name__ == "__main__":
+    write_rst()

{ultraplot-2.1.5 → ultraplot-2.2.0}/docs/_static/custom.css

@@ -1212,3 +1212,41 @@ body.wy-body-for-nav
     border-radius: 0.2rem;
     background: var(--uplt-color-sidebar-bg);
 }
+
+/* What's-new release bodies generated by docs/_scripts/fetch_releases.py.
+   Each release is emitted inside a <div class="uplt-whats-new-release-body">
+   so we have a single styling hook for spacing, code-block padding, and the
+   <details> snippet affordance. */
+.uplt-whats-new-release-body {
+    margin-top: 0.5rem;
+    margin-bottom: 1.5rem;
+}
+
+.uplt-whats-new-release-body h2,
+.uplt-whats-new-release-body h3,
+.uplt-whats-new-release-body h4 {
+    margin-top: 1.25rem;
+    margin-bottom: 0.5rem;
+}
+
+.uplt-whats-new-release-body details {
+    margin: 0.5rem 0 1rem;
+    padding: 0.25rem 0.75rem;
+    border: 1px solid var(--uplt-color-sidebar-bg, #e5e7eb);
+    border-radius: 0.35rem;
+    background: var(--uplt-color-sidebar-bg, #f9fafb);
+}
+
+.uplt-whats-new-release-body details > summary {
+    cursor: pointer;
+    font-weight: 600;
+}
+
+.uplt-whats-new-release-body pre {
+    overflow-x: auto;
+}
+
+.uplt-whats-new-release-body img {
+    max-width: 100%;
+    height: auto;
+}

{ultraplot-2.1.5 → ultraplot-2.2.0}/environment.yml

@@ -20,5 +20,7 @@ dependencies:
   - networkx
   - pyarrow
   - cftime
+  - markdown
+  - requests
   - pip:
       - pycirclize

{ultraplot-2.1.5 → ultraplot-2.2.0}/pyproject.toml

@@ -74,7 +74,7 @@ docs = [
     "jupyter",
     "jupytext",
     "lxml-html-clean",
-    "m2r2",
+    "markdown",
     "mpltern",
     "nbsphinx",
     "sphinx",

{ultraplot-2.1.5 → ultraplot-2.2.0}/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']}.")
 
@@ -282,19 +288,70 @@ def validate_inputs(dist_dir: Path, access_token: str | None) -> None:
         raise SystemExit(f"Distribution directory {dist_dir} does not contain files.")
 
 
+def find_existing_draft(api_url: str, token: str, record_id: int) -> dict | None:
+    record = api_request("GET", f"{api_url}/records/{record_id}", token=token)
+    conceptrecid = str(record.get("conceptrecid") or record.get("id"))
+
+    page = 1
+    while True:
+        payload = api_request(
+            "GET",
+            f"{api_url}/deposit/depositions?page={page}&size=100",
+            token=token,
+        )
+
+        if not payload:
+            break
+
+        for dep in payload:
+            if str(dep.get("conceptrecid")) != conceptrecid:
+                continue
+            if dep.get("submitted"):
+                continue
+
+            print(f"Found existing draft deposition {dep['id']}")
+            return dep
+
+        if len(payload) < 100:
+            break
+
+        page += 1
+
+    return None
+
+
+def get_or_create_draft(api_url: str, token: str, record_id: int) -> dict:
+    try:
+        return create_new_version(api_url, token, record_id)
+    except RuntimeError as exc:
+        message = str(exc)
+        if "files.enabled" not in message:
+            raise
+
+        draft = find_existing_draft(api_url, token, record_id)
+        if draft is None:
+            raise
+        print(f"Reusing existing Zenodo draft {draft['id']}.")
+        return draft
+
+
 def main() -> int:
     args = parse_args()
     validate_inputs(args.dist_dir, args.access_token)
-    citation = load_citation(args.citation)
+
+    citation = load_citation(args.citation_file)
     pyproject = load_pyproject(args.pyproject)
     metadata = build_metadata(citation, pyproject)
+
     conceptrecid = resolve_concept_recid(args.api_url, citation["doi"])
     record_id = latest_record_id(args.api_url, conceptrecid)
-    draft = create_new_version(args.api_url, args.access_token, record_id)
+
+    draft = get_or_create_draft(args.api_url, args.access_token, record_id)
     clear_draft_files(draft, args.access_token)
     upload_dist_files(draft, args.access_token, args.dist_dir)
     draft = update_metadata(draft, args.access_token, metadata)
     published = publish_draft(draft, args.access_token)
+
     doi = published.get("doi") or published.get("metadata", {}).get("doi")
     print(
         f"Published Zenodo release record {published['id']} for "