ultraplot 2.1.3__tar.gz → 2.1.9__tar.gz

{ultraplot-2.1.3 → ultraplot-2.1.9}/.github/dependabot.yml

@@ -1,5 +1,13 @@
 version: 2
 updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      python-dependencies:
+        patterns:
+          - "*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

{ultraplot-2.1.3 → 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.3 → ultraplot-2.1.9}/.github/workflows/main.yml

@@ -12,12 +12,16 @@ jobs:
       run: ${{ (github.event_name == 'push' && github.ref_name == 'main') && 'true' || steps.filter.outputs.python }}
     steps:
       - uses: actions/checkout@v6
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@v4
         id: filter
         with:
           filters: |
             python:
               - 'ultraplot/**'
+              - 'pyproject.toml'
+              - 'environment.yml'
+              - '.github/workflows/**'
+              - 'tools/ci/**'
 
   select-tests:
     runs-on: ubuntu-latest
@@ -46,13 +50,13 @@ 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
           create-args: >-
             --verbose
-            python=3.11
+            python=3.10
             matplotlib=3.9
           cache-environment: true
           cache-downloads: false
@@ -126,107 +130,63 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: Install dependencies
-        run: pip install tomli
-
       - id: set-versions
         run: |
-          # Create a Python script to read and parse versions
-          cat > get_versions.py << 'EOF'
-          import tomli
-          import re
-          import json
-
-          # Read pyproject.toml
-          with open("pyproject.toml", "rb") as f:
-              data = tomli.load(f)
-
-          # Get Python version requirement
-          python_req = data["project"]["requires-python"]
-
-          # Parse min and max versions
-          min_version = re.search(r">=(\d+\.\d+)", python_req)
-          max_version = re.search(r"<(\d+\.\d+)", python_req)
-
-          python_versions = []
-          if min_version and max_version:
-              # Convert version strings to tuples
-              min_v = tuple(map(int, min_version.group(1).split(".")))
-              max_v = tuple(map(int, max_version.group(1).split(".")))
-
-              # Generate version list
-              current = min_v
-              while current < max_v:
-                  python_versions.append(".".join(map(str, current)))
-                  current = (current[0], current[1] + 1)
-
-
-          # parse MPL versions
-          mpl_req = None
-          for d in data["project"]["dependencies"]:
-            if d.startswith("matplotlib"):
-              mpl_req = d
-              break
-          assert mpl_req is not None, "matplotlib version not found in dependencies"
-          min_version = re.search(r">=(\d+\.\d+)", mpl_req)
-          max_version = re.search(r"<(\d+\.\d+)", mpl_req)
-
-          mpl_versions = []
-          if min_version and max_version:
-              # Convert version strings to tuples
-              min_v = tuple(map(int, min_version.group(1).split(".")))
-              max_v = tuple(map(int, max_version.group(1).split(".")))
-
-              # Generate version list
-              current = min_v
-              while current < max_v:
-                  mpl_versions.append(".".join(map(str, current)))
-                  current = (current[0], current[1] + 1)
-
-          # If no versions found, default to 3.9
-          if not mpl_versions:
-              mpl_versions = ["3.9"]
+          OUTPUT=$(python tools/ci/version_support.py)
+          echo "Detected Python versions: $(echo "$OUTPUT" | jq -c '.python_versions')"
+          echo "Detected Matplotlib versions: $(echo "$OUTPUT" | jq -c '.matplotlib_versions')"
+          echo "Detected test matrix: $(echo "$OUTPUT" | jq -c '.test_matrix')"
+          python tools/ci/version_support.py --format github-output >> $GITHUB_OUTPUT
+
+  coverage:
+    name: Coverage
+    runs-on: ubuntu-latest
+    needs:
+      - run-if-changes
+    if: always() && needs.run-if-changes.outputs.run == 'true' && github.event_name == 'pull_request'
+    defaults:
+      run:
+        shell: bash -el {0}
+    steps:
+      - name: Set up swap space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 10
 
-          # Create output dictionary
-          midpoint_python = python_versions[len(python_versions) // 2]
-          midpoint_mpl = mpl_versions[len(mpl_versions) // 2]
-          matrix_candidates = [
-              (python_versions[0], mpl_versions[0]),  # lowest + lowest
-              (midpoint_python, midpoint_mpl),        # midpoint + midpoint
-              (python_versions[-1], mpl_versions[-1]) # latest + latest
-          ]
-          test_matrix = []
-          seen = set()
-          for py_ver, mpl_ver in matrix_candidates:
-              key = (py_ver, mpl_ver)
-              if key in seen:
-                  continue
-              seen.add(key)
-              test_matrix.append(
-                  {"python-version": py_ver, "matplotlib-version": mpl_ver}
-              )
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
-          output = {
-              "python_versions": python_versions,
-              "matplotlib_versions": mpl_versions,
-              "test_matrix": test_matrix,
-          }
+      - uses: mamba-org/setup-micromamba@v3.0.0
+        with:
+          environment-file: ./environment.yml
+          init-shell: bash
+          condarc-file: ./.github/micromamba-condarc.yml
+          post-cleanup: none
+          create-args: >-
+            --verbose
+            python=3.10
+            matplotlib=3.9
+          cache-environment: true
+          cache-downloads: false
 
-          # Print as JSON
-          print(json.dumps(output))
-          EOF
+      - name: Build Ultraplot
+        run: |
+          pip install --no-build-isolation --no-deps .
 
-          # Run the script and capture output
-          OUTPUT=$(python3 get_versions.py)
-          PYTHON_VERSIONS=$(echo $OUTPUT | jq -r '.python_versions')
-          MPL_VERSIONS=$(echo $OUTPUT | jq -r '.matplotlib_versions')
+      - name: Run full coverage suite
+        run: |
+          pytest -q --tb=short --disable-warnings -n auto -p pytest_cov \
+            --cov=ultraplot --cov-branch --cov-context=test \
+            --cov-report=xml:coverage.xml --cov-report= \
+            ultraplot/tests
 
-          echo "Detected Python versions: ${PYTHON_VERSIONS}"
-          echo "Detected Matplotlib versions: ${MPL_VERSIONS}"
-          echo "Detected test matrix: $(echo $OUTPUT | jq -c '.test_matrix')"
-          echo "python-versions=$(echo $PYTHON_VERSIONS | jq -c)" >> $GITHUB_OUTPUT
-          echo "matplotlib-versions=$(echo $MPL_VERSIONS | jq -c)" >> $GITHUB_OUTPUT
-          echo "test-matrix=$(echo $OUTPUT | jq -c '.test_matrix')" >> $GITHUB_OUTPUT
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v6
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage.xml
+          name: codecov-pr-python3.10-mpl3.9
 
   build:
     needs:

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

@@ -1,13 +1,13 @@
 name: Publish to PyPI
+
 on:
   pull_request:
-  release:
-    types: [published]
   push:
-    tags: ["v*"]
+    tags:
+      - "v*"
 
 concurrency:
-  group: publish-pypi-{{ github.sha }}
+  group: publish-pypi-${{ github.sha }}
   cancel-in-progress: false
 
 jobs:
@@ -19,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
@@ -80,7 +83,7 @@ jobs:
 
       - name: Check files
         run: |
-          ls dist
+          ls -lah dist
         shell: bash
 
       - name: Publish to TestPyPI
@@ -88,18 +91,16 @@ jobs:
         with:
           repository-url: https://test.pypi.org/legacy/
           verbose: true
-          # releases generate both release and tag events so
-          # we get a race condition if we don't skip existing
-          skip-existing: ${{ (github.event_name == 'release' || github.event_name == 'push') && 'true' || 'false' }}
+          skip-existing: true
 
   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 == 'release'
     permissions:
       id-token: write
       contents: read
@@ -112,10 +113,73 @@ jobs:
 
       - name: Check files
         run: |
-          ls dist
+          ls -lah dist
         shell: bash
 
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           verbose: true
+          skip-existing: true
+
+  publish-github-release:
+    name: Publish GitHub release
+    needs: publish-pypi
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    permissions:
+      contents: write
+    steps:
+      - name: Create GitHub release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+
+  publish-zenodo:
+    name: Publish Zenodo release
+    needs: publish-github-release
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    permissions:
+      contents: read
+    env:
+      ZENODO_ACCESS_TOKEN: ${{ secrets.ZENODO_ACCESS_TOKEN }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+
+      - name: Install release tooling
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install PyYAML
+        shell: bash
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v8
+        with:
+          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 \
+            --citation-file "${RUNNER_TEMP}/CITATION.cff"
+        shell: bash

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

@@ -23,13 +23,13 @@ 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
           create-args: >-
             --verbose
-            python=3.11
+            python=3.10
             matplotlib=3.9
           cache-environment: true
           cache-downloads: false
@@ -42,10 +42,18 @@ jobs:
         run: |
           mkdir -p .ci
           pytest -q --tb=short --disable-warnings -n 0 -p pytest_cov \
-            --cov=ultraplot --cov-branch --cov-context=test --cov-report= \
+            --cov=ultraplot --cov-branch --cov-context=test \
+            --cov-report=xml:coverage.xml --cov-report= \
             ultraplot/tests
           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@v6
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage.xml
+          name: codecov-test-map
+
       - name: Cache test map
         uses: actions/cache@v5
         with:

{ultraplot-2.1.3 → 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.3 → ultraplot-2.1.9}/CITATION.cff

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ultraplot
-Version: 2.1.3
+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>
@@ -170,16 +170,10 @@ To install a development version of UltraPlot, you can use
 or clone the repository and run ``pip install -e .``
 inside the ``ultraplot`` folder.
 
-If you use UltraPlot in your research, please cite it using the following BibTeX entry::
-
-    @software{vanElteren2025,
-      author       = {Casper van Elteren and Matthew R. Becker},
-      title        = {UltraPlot: A succinct wrapper for Matplotlib},
-      year         = {2025},
-      version      = {1.57.1},
-      publisher    = {GitHub},
-      url          = {https://github.com/Ultraplot/UltraPlot}
-    }
+If you use UltraPlot in your research, please cite the latest release metadata in
+``CITATION.cff``. GitHub can export this metadata as BibTeX from the
+repository's "Cite this repository" panel, and the Zenodo badge below points to
+the project DOI across releases.
 
 .. |downloads| image:: https://static.pepy.tech/personalized-badge/UltraPlot?period=total&units=international_system&left_color=black&right_color=orange&left_text=Downloads
     :target: https://pepy.tech/project/ultraplot

{ultraplot-2.1.3 → ultraplot-2.1.9}/README.rst

@@ -125,16 +125,10 @@ To install a development version of UltraPlot, you can use
 or clone the repository and run ``pip install -e .``
 inside the ``ultraplot`` folder.
 
-If you use UltraPlot in your research, please cite it using the following BibTeX entry::
-
-    @software{vanElteren2025,
-      author       = {Casper van Elteren and Matthew R. Becker},
-      title        = {UltraPlot: A succinct wrapper for Matplotlib},
-      year         = {2025},
-      version      = {1.57.1},
-      publisher    = {GitHub},
-      url          = {https://github.com/Ultraplot/UltraPlot}
-    }
+If you use UltraPlot in your research, please cite the latest release metadata in
+``CITATION.cff``. GitHub can export this metadata as BibTeX from the
+repository's "Cite this repository" panel, and the Zenodo badge below points to
+the project DOI across releases.
 
 .. |downloads| image:: https://static.pepy.tech/personalized-badge/UltraPlot?period=total&units=international_system&left_color=black&right_color=orange&left_text=Downloads
     :target: https://pepy.tech/project/ultraplot

{ultraplot-2.1.3 → ultraplot-2.1.9}/docs/Makefile

@@ -12,7 +12,7 @@ BUILDDIR    = _build
 .PHONY: help clean html html-exec Makefile
 
 html:
-	@UPLT_DOCS_EXECUTE=$${UPLT_DOCS_EXECUTE:-always} $(SPHINXBUILD) -b html "$(SOURCEDIR)" "$(BUILDDIR)/html" -E -a $(SPHINXOPTS)
+	@UPLT_DOCS_EXECUTE=$${UPLT_DOCS_EXECUTE:-auto} $(SPHINXBUILD) -b html "$(SOURCEDIR)" "$(BUILDDIR)/html" $(SPHINXOPTS)
 
 html-exec:
 	@UPLT_DOCS_EXECUTE=always $(SPHINXBUILD) -b html "$(SOURCEDIR)" "$(BUILDDIR)/html" -E -a $(SPHINXOPTS)