plot3 0.6.2__tar.gz → 0.6.4__tar.gz

{plot3-0.6.2 → plot3-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.6.2
+Version: 0.6.4
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT
@@ -17,18 +17,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.24
 Requires-Dist: pandas>=2.0
-Provides-Extra: fast
-Requires-Dist: contourpy>=1.0; extra == "fast"
+Provides-Extra: pdf
+Requires-Dist: cairosvg>=2.7; extra == "pdf"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: polars>=1.0; extra == "dev"
 Requires-Dist: contourpy>=1.0; extra == "dev"
-Provides-Extra: jupyter
-Requires-Dist: ipython>=8.0; extra == "jupyter"
-Provides-Extra: polars
-Requires-Dist: polars>=1.0; extra == "polars"
-Provides-Extra: export
-Requires-Dist: cairosvg>=2.7; extra == "export"
 Dynamic: license-file
 
 # plot3
@@ -57,7 +51,7 @@ in the notebook and save as journal-ready PNG, SVG, or PDF.
 </table>
 
 ```bash
-pip install "plot3[jupyter,export]"
+pip install plot3
 ```
 
 Contents: [Plot an equation](#plot-an-equation) ·
@@ -279,27 +273,35 @@ In notebooks, bare column names work as in R: `aes(x=dose, y=response)`.
 ## Install
 
 ```bash
-pip install "plot3[jupyter,export]"
+pip install plot3
 ```
 
 Python 3.10 or newer; NumPy and pandas are the only required packages.
+Notebooks, pandas, and Polars tables work with no extras.
 
-| Extra | Adds |
-|---|---|
-| `export` | `cairosvg`: PNG with real fonts and PDF. Needs the Cairo C library (`brew install cairo`, `apt install libcairo2`). SVG needs nothing. |
-| `fast` | `contourpy`: faster implicit-curve contours (matplotlib users have it) |
-| `jupyter` | IPython integration (bare column names, `%plot3`) |
-| `polars` | Polars tables |
+For PDF, and PNG with real fonts, add cairosvg and the Cairo library. SVG
+needs neither.
+
+```bash
+pip install cairosvg
+```
+
+```bash
+brew install cairo
+```
+
+(`apt install libcairo2` on Debian and Ubuntu.) `pip install "plot3[pdf]"`
+installs plot3 and cairosvg together.
 
 The latest unreleased code installs from GitHub with
-`pip install "plot3[jupyter,export] @ git+https://github.com/rleyvasal/plot3"`.
+`pip install "plot3 @ git+https://github.com/rleyvasal/plot3"`.
 
 ## Development
 
 ```bash
 git clone https://github.com/rleyvasal/plot3 && cd plot3
 python3 -m venv .venv && source .venv/bin/activate
-pip install -e ".[dev,jupyter,export]"
+pip install -e ".[dev]"
 pytest -q                       # includes every example in this README and docs/reference.md
 python examples/showcase_2d.py  # 2D gallery in the browser
 python examples/showcase_3d.py  # 3D gallery

{plot3-0.6.2 → plot3-0.6.4}/README.md

@@ -24,7 +24,7 @@ in the notebook and save as journal-ready PNG, SVG, or PDF.
 </table>
 
 ```bash
-pip install "plot3[jupyter,export]"
+pip install plot3
 ```
 
 Contents: [Plot an equation](#plot-an-equation) ·
@@ -246,27 +246,35 @@ In notebooks, bare column names work as in R: `aes(x=dose, y=response)`.
 ## Install
 
 ```bash
-pip install "plot3[jupyter,export]"
+pip install plot3
 ```
 
 Python 3.10 or newer; NumPy and pandas are the only required packages.
+Notebooks, pandas, and Polars tables work with no extras.
 
-| Extra | Adds |
-|---|---|
-| `export` | `cairosvg`: PNG with real fonts and PDF. Needs the Cairo C library (`brew install cairo`, `apt install libcairo2`). SVG needs nothing. |
-| `fast` | `contourpy`: faster implicit-curve contours (matplotlib users have it) |
-| `jupyter` | IPython integration (bare column names, `%plot3`) |
-| `polars` | Polars tables |
+For PDF, and PNG with real fonts, add cairosvg and the Cairo library. SVG
+needs neither.
+
+```bash
+pip install cairosvg
+```
+
+```bash
+brew install cairo
+```
+
+(`apt install libcairo2` on Debian and Ubuntu.) `pip install "plot3[pdf]"`
+installs plot3 and cairosvg together.
 
 The latest unreleased code installs from GitHub with
-`pip install "plot3[jupyter,export] @ git+https://github.com/rleyvasal/plot3"`.
+`pip install "plot3 @ git+https://github.com/rleyvasal/plot3"`.
 
 ## Development
 
 ```bash
 git clone https://github.com/rleyvasal/plot3 && cd plot3
 python3 -m venv .venv && source .venv/bin/activate
-pip install -e ".[dev,jupyter,export]"
+pip install -e ".[dev]"
 pytest -q                       # includes every example in this README and docs/reference.md
 python examples/showcase_2d.py  # 2D gallery in the browser
 python examples/showcase_3d.py  # 3D gallery

plot3-0.6.4/plot3/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.6.4"

{plot3-0.6.2 → plot3-0.6.4}/plot3/contour.py

@@ -115,7 +115,7 @@ def _backend_name() -> str:
         if _load_contourpy() is None:
             raise ValueError(
                 "PLOT3_CONTOUR_BACKEND=contourpy but contourpy>=1.0 is not "
-                "installed. Install it with: pip install plot3[fast]"
+                "installed. Install it with: pip install contourpy"
             )
         return "contourpy"
     if _load_contourpy() is None:
@@ -346,7 +346,7 @@ def _contour_contourpy(
     if contourpy is None:
         raise ValueError(
             "PLOT3_CONTOUR_BACKEND=contourpy but contourpy>=1.0 is not "
-            "installed. Install it with: pip install plot3[fast]"
+            "installed. Install it with: pip install contourpy"
         )
     masked = np.ma.masked_invalid(np.asarray(field, dtype=np.float64))
     generator = contourpy.contour_generator(

{plot3-0.6.2 → plot3-0.6.4}/plot3/ggplot.py

@@ -517,7 +517,7 @@ class ggplot:
         suffix writes the standalone HTML viewer. ``width`` and ``height``
         are pixels unless ``units`` is ``"in"``, ``"cm"``, or ``"mm"``.
         ``dpi`` is the PNG resolution for a physical size (default 300).
-        PDF needs ``plot3[export]`` and the Cairo C library. ``.svg``
+        PDF needs cairosvg and the Cairo C library. ``.svg``
         needs neither.
         """
         suffix = Path(path).suffix.lower()
@@ -683,8 +683,8 @@ def ggsave(
     """Save ``plot``.
 
     ``ggsave("fig.png", p)`` and ``ggsave("fig.svg", p)`` write a static
-    image. ``ggsave("fig.pdf", p)`` writes a PDF when ``plot3[export]`` is
-    installed. That extra also needs the Cairo C library; ``.svg`` writes
+    image. ``ggsave("fig.pdf", p)`` writes a PDF when cairosvg is
+    installed (``plot3[pdf]``). It also needs the Cairo C library; ``.svg`` writes
     the same drawing with no extra dependencies. Any other suffix,
     including ``.html``, writes the standalone viewer. The plot and the
     filename can be passed in either order.

{plot3-0.6.2 → plot3-0.6.4}/plot3/static.py

@@ -2,7 +2,7 @@
 
 PNG, SVG, and PDF replay one list of drawing commands. SVG is text.
 PNG and PDF are that same SVG rendered by cairosvg when the optional
-``plot3[export]`` extra is installed, so the three files share one
+``plot3[pdf]`` extra (cairosvg) is installed, so the three files share one
 drawing and one font. That extra needs the Cairo C library as well as
 the Python package (``libcairo2``, or the GTK runtime on Windows).
 Without cairosvg, PNG falls back to a zlib RGB file and a built-in
@@ -42,7 +42,7 @@ _UNIT_INCH = {
 }
 _EXPORT_HINT = (
     "ggsave() needs the Cairo C library to write PDF with a journal font. "
-    "Install the Python extra with: pip install 'plot3[export]'. "
+    "Install it with: pip install cairosvg. "
     "Windows and minimal Linux images also need the Cairo library itself "
     "(for example the libcairo2 package, or the GTK runtime). "
     "ggsave('fig.svg', plot) writes the same drawing with no extra dependencies."
@@ -196,8 +196,8 @@ def save_static(
     ``"cm"`` and ``"mm"``) with ``dpi`` (default 300) sets a physical
     page. Layout stays in CSS pixels (96 per inch) so type keeps its
     size, and cairosvg rasterizes that SVG at ``dpi``. PDF and a
-    journal-font PNG need the Cairo C library (``pip install
-    'plot3[export]'``). ``.svg`` needs nothing extra.
+    journal-font PNG need cairosvg and the Cairo C library (``pip install
+    cairosvg``). ``.svg`` needs nothing extra.
     """
     path = Path(path)
     suffix = path.suffix.lower()
@@ -251,7 +251,7 @@ def save_static(
     if fallback:
         print(
             "plot3: PNG used the built-in font. "
-            "pip install 'plot3[export]' for Helvetica."
+            "pip install cairosvg for Helvetica."
         )
     return str(path)
 

{plot3-0.6.2 → plot3-0.6.4}/plot3/viewer.py

@@ -55,6 +55,9 @@ body{display:flex;flex-direction:column}
 #legend .sz-block{clear:both;padding-top:6px}
 #legend .bub{display:inline-block;border-radius:50%;box-sizing:border-box;flex:none;
   border:1px solid rgba(0,0,0,.35)}
+#legend.docked{display:flex!important;flex-wrap:wrap;align-items:center;column-gap:14px;row-gap:0;line-height:1.5}
+#legend.docked .sz-block{display:flex;flex-wrap:wrap;align-items:center;column-gap:10px;padding-top:0;clear:none}
+#legend.docked .sz{margin:0}
 #player{display:none;flex:none;align-items:center;flex-wrap:wrap;gap:8px;padding:4px 10px 8px;max-width:100%;box-sizing:border-box}
 #player button{font:inherit;padding:3px 10px;border-radius:5px;cursor:pointer}
 #player #play-range{flex:1;min-width:80px}
@@ -345,19 +348,25 @@ function showLegendBox() {
   legEl.style.border = '1px solid ' + T.grid;
   legEl.style.color = T.ink2;
 }
+// Height the docked legend takes at the bottom; the plot shrinks by it.
+let legendReserve = 0;
 function placeLegend() {
-  if (!legEl || legEl.style.display === 'none' || legEl.dataset.docked === '1') return;
+  legendReserve = 0;
+  if (!legEl || legEl.style.display === 'none') return;
   const figH = figEl.clientHeight || 0;
   if (figH < 40) return;
-  // A key taller than the panel covers the curve. Sit it under the axes.
-  if (legEl.offsetHeight > figH * 0.40) {
+  // A key taller than the panel covers the data (a short notebook output).
+  // Lay it out in rows under the axes, and keep that room free.
+  if (legEl.dataset.docked !== '1' && legEl.offsetHeight > figH * 0.40) {
     legEl.dataset.docked = '1';
+    legEl.classList.add('docked');
     legEl.style.top = 'auto';
-    legEl.style.bottom = '8px';
+    legEl.style.bottom = '6px';
     legEl.style.left = '8px';
     legEl.style.right = '8px';
     legEl.style.maxWidth = 'none';
   }
+  if (legEl.dataset.docked === '1') legendReserve = legEl.offsetHeight + 8;
 }
 const LEGEND_GLYPH = { circle: '●', triangle: '▲', square: '■', diamond: '◆', plus: '+', cross: '×' };
 // Legend keys: a square, the point's symbol, or a short (dashed) line.
@@ -2036,7 +2045,7 @@ if (!S.is3d) {
   function layout() {
     placeLegend();
     W = Math.max(50, figEl.clientWidth - M.l - M.r);
-    H = Math.max(50, figEl.clientHeight - M.t - M.b);
+    H = Math.max(50, figEl.clientHeight - M.t - M.b - legendReserve);
     if (equalAspect) applyEqual();
     host.style.left = M.l + 'px'; host.style.top = M.t + 'px';
     renderer.setSize(W, H);
@@ -2741,7 +2750,7 @@ if (!S.is3d) {
 
   function layout() {
     placeLegend();
-    const w = Math.max(figEl.clientWidth, 1), h = Math.max(figEl.clientHeight, 1);
+    const w = Math.max(figEl.clientWidth, 1), h = Math.max(figEl.clientHeight - legendReserve, 1);
     renderer.setSize(w, h);
     cam.aspect = w / h;
     cam.updateProjectionMatrix();
@@ -2763,7 +2772,7 @@ if (!S.is3d) {
   const touches = (a, b, air) => a[0] - air < b[0] + b[2] && b[0] - air < a[0] + a[2] &&
     a[1] - air < b[1] + b[3] && b[1] - air < a[1] + a[3];
   function declutterTicks() {
-    const w = Math.max(figEl.clientWidth, 1), h = Math.max(figEl.clientHeight, 1);
+    const w = Math.max(figEl.clientWidth, 1), h = Math.max(figEl.clientHeight - legendReserve, 1);
     const placed = [];
     for (const marks of tickSprites) {
       if (!marks.length) continue;

{plot3-0.6.2 → plot3-0.6.4}/plot3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plot3
-Version: 0.6.2
+Version: 0.6.4
 Summary: ggplot2 grammar of graphics for Python: interactive WebGL figures and journal-ready PNG, SVG, and PDF
 Author: Rigoberto Leyva Salmeron
 License-Expression: MIT
@@ -17,18 +17,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.24
 Requires-Dist: pandas>=2.0
-Provides-Extra: fast
-Requires-Dist: contourpy>=1.0; extra == "fast"
+Provides-Extra: pdf
+Requires-Dist: cairosvg>=2.7; extra == "pdf"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: polars>=1.0; extra == "dev"
 Requires-Dist: contourpy>=1.0; extra == "dev"
-Provides-Extra: jupyter
-Requires-Dist: ipython>=8.0; extra == "jupyter"
-Provides-Extra: polars
-Requires-Dist: polars>=1.0; extra == "polars"
-Provides-Extra: export
-Requires-Dist: cairosvg>=2.7; extra == "export"
 Dynamic: license-file
 
 # plot3
@@ -57,7 +51,7 @@ in the notebook and save as journal-ready PNG, SVG, or PDF.
 </table>
 
 ```bash
-pip install "plot3[jupyter,export]"
+pip install plot3
 ```
 
 Contents: [Plot an equation](#plot-an-equation) ·
@@ -279,27 +273,35 @@ In notebooks, bare column names work as in R: `aes(x=dose, y=response)`.
 ## Install
 
 ```bash
-pip install "plot3[jupyter,export]"
+pip install plot3
 ```
 
 Python 3.10 or newer; NumPy and pandas are the only required packages.
+Notebooks, pandas, and Polars tables work with no extras.
 
-| Extra | Adds |
-|---|---|
-| `export` | `cairosvg`: PNG with real fonts and PDF. Needs the Cairo C library (`brew install cairo`, `apt install libcairo2`). SVG needs nothing. |
-| `fast` | `contourpy`: faster implicit-curve contours (matplotlib users have it) |
-| `jupyter` | IPython integration (bare column names, `%plot3`) |
-| `polars` | Polars tables |
+For PDF, and PNG with real fonts, add cairosvg and the Cairo library. SVG
+needs neither.
+
+```bash
+pip install cairosvg
+```
+
+```bash
+brew install cairo
+```
+
+(`apt install libcairo2` on Debian and Ubuntu.) `pip install "plot3[pdf]"`
+installs plot3 and cairosvg together.
 
 The latest unreleased code installs from GitHub with
-`pip install "plot3[jupyter,export] @ git+https://github.com/rleyvasal/plot3"`.
+`pip install "plot3 @ git+https://github.com/rleyvasal/plot3"`.
 
 ## Development
 
 ```bash
 git clone https://github.com/rleyvasal/plot3 && cd plot3
 python3 -m venv .venv && source .venv/bin/activate
-pip install -e ".[dev,jupyter,export]"
+pip install -e ".[dev]"
 pytest -q                       # includes every example in this README and docs/reference.md
 python examples/showcase_2d.py  # 2D gallery in the browser
 python examples/showcase_3d.py  # 3D gallery

{plot3-0.6.2 → plot3-0.6.4}/plot3.egg-info/requires.txt

@@ -6,14 +6,5 @@ pytest>=7.0
 polars>=1.0
 contourpy>=1.0
 
-[export]
+[pdf]
 cairosvg>=2.7
-
-[fast]
-contourpy>=1.0
-
-[jupyter]
-ipython>=8.0
-
-[polars]
-polars>=1.0

{plot3-0.6.2 → plot3-0.6.4}/pyproject.toml

@@ -25,11 +25,8 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-fast = ["contourpy>=1.0"]
+pdf = ["cairosvg>=2.7"]
 dev = ["pytest>=7.0", "polars>=1.0", "contourpy>=1.0"]
-jupyter = ["ipython>=8.0"]
-polars = ["polars>=1.0"]
-export = ["cairosvg>=2.7"]
 
 [project.urls]
 Homepage = "https://github.com/rleyvasal/plot3"

{plot3-0.6.2 → plot3-0.6.4}/tests/test_contour.py

@@ -265,7 +265,7 @@ def test_version_floor_and_backend_selection(monkeypatch):
     assert _backend_name() == "numpy"
     monkeypatch.setenv("PLOT3_CONTOUR_BACKEND", "contourpy")
     _reset_contour_backend()
-    with pytest.raises(ValueError, match=r"plot3\[fast\]"):
+    with pytest.raises(ValueError, match=r"pip install contourpy"):
         _contour_lines(np.linspace(-1, 1, 4), np.linspace(-1, 1, 4), np.zeros((4, 4)), 0.0)
 
     fake = types.ModuleType("contourpy")

{plot3-0.6.2 → plot3-0.6.4}/tests/test_static_save.py

@@ -438,7 +438,7 @@ def test_inches_and_dpi_set_the_png_page(tmp_path, monkeypatch, capsys):
     rgb = _read_png(path)
     assert rgb.shape == (1200, 2100, 3)
     assert tuple(rgb[0, 0]) == (255, 255, 255)
-    assert "plot3[export]" in capsys.readouterr().out
+    assert "pip install cairosvg" in capsys.readouterr().out
 
     cm = tmp_path / "cm.png"
     ggsave(cm, fig, width=2.54, height=2.54, units="cm", dpi=100)
@@ -466,7 +466,7 @@ def test_pdf_without_cairosvg_names_the_extra(tmp_path, monkeypatch):
     from plot3 import static
 
     monkeypatch.setattr(static, "_load_cairosvg", lambda: None)
-    with pytest.raises(RuntimeError, match=r"plot3\[export\]") as caught:
+    with pytest.raises(RuntimeError, match=r"pip install cairosvg") as caught:
         ggsave(tmp_path / "fig.pdf", _curve())
     message = str(caught.value)
     assert "Cairo" in message

plot3-0.6.2/plot3/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.6.2"