physpyx 2.3.0__tar.gz → 3.1.0__tar.gz

{physpyx-2.3.0 → physpyx-3.1.0}/PKG-INFO

@@ -1,21 +1,21 @@
 Metadata-Version: 2.4
 Name: physpyx
-Version: 2.3.0
+Version: 3.1.0
 Summary: Provides a way to use python code in LaTeX
 Author: Jérôme Dufour
 Author-email: Jérôme Dufour <jerome.dufour@eduvaud.ch>
 License-Expression: GPL-3.0-or-later
-Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: Unix
+Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Education
 Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Dist: numpy>=2.3.4
 Requires-Dist: pint>=0.25.1
 Requires-Dist: scipy>=1.17.0
 Requires-Python: >=3.13
-Project-URL: Repository, https://bitbucket.org/jdufour/physpyx/src/master/
 Project-URL: Changelog, https://bitbucket.org/jdufour/physpyx/src/master/CHANGELOG.md
 Project-URL: Documentation, https://physpyx.readthedocs.io/fr/latest/
+Project-URL: Repository, https://bitbucket.org/jdufour/physpyx/src/master/
 Description-Content-Type: text/markdown
 
 # PhysPyX

{physpyx-2.3.0 → physpyx-3.1.0}/pyproject.toml

@@ -1,16 +1,16 @@
 [project]
 name = "physpyx"
-version = "2.3.0"
+version = "3.1.0"
 description = "Provides a way to use python code in LaTeX"
+readme = "README.md"
+requires-python = ">=3.13"
+license = "GPL-3.0-or-later"
 classifiers = [
-    "Programming Language :: Python :: 3",
     "Operating System :: Unix",
+    "Programming Language :: Python :: 3",
     "Topic :: Education",
     "Topic :: Scientific/Engineering :: Physics",
 ]
-license = "GPL-3.0-or-later"
-readme = "README.md"
-requires-python = ">=3.13"
 dependencies = [
     "numpy>=2.3.4",
     "pint>=0.25.1",
@@ -22,27 +22,27 @@ name = "Jérôme Dufour"
 email = "jerome.dufour@eduvaud.ch"
 
 [project.urls]
-Repository = "https://bitbucket.org/jdufour/physpyx/src/master/"
 Changelog = "https://bitbucket.org/jdufour/physpyx/src/master/CHANGELOG.md"
 Documentation = "https://physpyx.readthedocs.io/fr/latest/"
+Repository = "https://bitbucket.org/jdufour/physpyx/src/master/"
 
 [dependency-groups]
 dev = [
-    "mypy>=1.18.1",
     "ipdb>=0.13.13",
-    "scipy-stubs>=1.17.1.5",
+    "mypy>=2.3.0",
     "ruff>=0.16.0",
+    "scipy-stubs>=1.17.1.5",
 ]
 docs = [
+    "myst-parser>=4.0.1",
     "sphinx>=7.1.2",
-    "sphinx-rtd-theme>=3.0.2",
     "sphinx-argparse>=0.5.2",
-    "myst-parser>=4.0.1",
-    "sphinx-autodoc2>=0.5.0",
     "sphinx-autobuild>=2025.8.25",
+    "sphinx-autodoc2>=0.5.0",
     "sphinx-design>=0.7.0",
+    "sphinx-rtd-theme>=3.0.2",
 ]
 
 [build-system]
-requires = ["uv_build>=0.11.0,<0.12.0"]
+requires = ["uv_build>=0.12.0,<0.13.0"]
 build-backend = "uv_build"

{physpyx-2.3.0 → physpyx-3.1.0}/pyproject.toml.orig

@@ -1,47 +1,47 @@
 [project]
 name = "physpyx"
-version = "2.3.0"
+version = "3.1.0"
+description = "Provides a way to use python code in LaTeX"
+readme = "README.md"
+requires-python = ">=3.13"
+license = "GPL-3.0-or-later"
 authors = [
-	{ name="Jérôme Dufour", email="jerome.dufour@eduvaud.ch" },
+  { name = "Jérôme Dufour", email = "jerome.dufour@eduvaud.ch" },
 ]
-description = "Provides a way to use python code in LaTeX"
 classifiers = [
-	"Programming Language :: Python :: 3",
-	"Operating System :: Unix",
-	"Topic :: Education",
-  "Topic :: Scientific/Engineering :: Physics"
+  "Operating System :: Unix",
+  "Programming Language :: Python :: 3",
+  "Topic :: Education",
+  "Topic :: Scientific/Engineering :: Physics",
 ]
-license = "GPL-3.0-or-later"
-readme = "README.md"
-requires-python = ">=3.13"
 dependencies = [
   "numpy>=2.3.4",
   "pint>=0.25.1",
   "scipy>=1.17.0",
 ]
 
+[project.urls]
+Changelog = "https://bitbucket.org/jdufour/physpyx/src/master/CHANGELOG.md"
+Documentation = "https://physpyx.readthedocs.io/fr/latest/"
+Repository = "https://bitbucket.org/jdufour/physpyx/src/master/"
+
 [dependency-groups]
 dev = [
-  "mypy>=1.18.1",
   "ipdb>=0.13.13",
-  "scipy-stubs>=1.17.1.5",
+  "mypy>=2.3.0",
   "ruff>=0.16.0",
+  "scipy-stubs>=1.17.1.5",
 ]
 docs = [
-	"sphinx>=7.1.2",
-	"sphinx-rtd-theme>=3.0.2",
-	"sphinx-argparse>=0.5.2",
-	"myst-parser>=4.0.1",
-	"sphinx-autodoc2>=0.5.0",
-	"sphinx-autobuild>=2025.8.25",
-	"sphinx-design>=0.7.0",
+  "myst-parser>=4.0.1",
+  "sphinx>=7.1.2",
+  "sphinx-argparse>=0.5.2",
+  "sphinx-autobuild>=2025.8.25",
+  "sphinx-autodoc2>=0.5.0",
+  "sphinx-design>=0.7.0",
+  "sphinx-rtd-theme>=3.0.2",
 ]
 
 [build-system]
-requires = ["uv_build>=0.11.0,<0.12.0"]
+requires = ["uv_build>=0.12.0,<0.13.0"]
 build-backend = "uv_build"
-
-[project.urls]
-Repository = "https://bitbucket.org/jdufour/physpyx/src/master/"
-Changelog = "https://bitbucket.org/jdufour/physpyx/src/master/CHANGELOG.md"
-Documentation = "https://physpyx.readthedocs.io/fr/latest/"

{physpyx-2.3.0 → physpyx-3.1.0}/src/physpyx/qty.py

@@ -1,7 +1,10 @@
 import re
 import sys
+from collections.abc import Iterable
 from logging import getLogger
+from typing import cast
 
+from numpy import array
 from pint._typing import Scalar
 from pint.facets.context import Context
 
@@ -41,7 +44,7 @@ class Qty(PTManager):
                 "\\ExplSyntaxOn\n\\prop_gset_from_keyval:Nn \\g_physpyx_pty_prop {\n"
             )
             for variable, qty in sys._getframe(2).f_locals.items():
-                if isinstance(qty, SiunitxQuantity):
+                if variable != "_" and isinstance(qty, SiunitxQuantity):
                     for name, new in qty.export(variable):
                         outfile.write(f"\t{{{name}}} = {{{new}}},\n")
                         if old := current.pop(name, None):
@@ -56,7 +59,7 @@ class Qty(PTManager):
 
     def __call__(
         self,
-        value: Scalar | list[Scalar] | str,
+        value: Scalar | Iterable[Scalar | SiunitxQuantity] | str,
         unit: str | None = None,
         to: str | None = None,
         fmt: str = "g",
@@ -90,6 +93,22 @@ class Qty(PTManager):
             if unit is not None:
                 logger.warning("Units are ignored when instanciating a constant")
             value, unit, fmt = self._constants(value, fmt)
+        elif isinstance(value, Iterable):
+            if all(isinstance(item, SiunitxQuantity) for item in value):
+                value = cast(Iterable[SiunitxQuantity], value)
+                dim = {v.dimensionality for v in value}
+                if len(dim) != 1:
+                    raise ValueError(
+                        f"Can't create a vector with different dimensionality ({dim})"
+                    )
+
+                if unit == None:
+                    unit = ""
+                if self._ureg.Unit(unit).dimensionality != dim.pop():
+                    raise ValueError("Need to set unit with correct dimensionality")
+                value = array([v.fmtex(to=unit).m for v in value])
+            else:
+                value = array(value)
 
         q = self._ureg.Quantity(
             value,

{physpyx-2.3.0 → physpyx-3.1.0}/src/physpyx/quantity.py

@@ -1,8 +1,8 @@
-from collections.abc import Generator, Iterator
+from collections.abc import Generator, Iterable, Iterator
 from logging import getLogger
 from typing import ClassVar, Self, TypedDict, cast
 
-from numpy import cross, linalg, ndarray
+from numpy import cross, linalg
 from pint._typing import Magnitude, UnitLike
 from pint.registry import Quantity
 
@@ -30,12 +30,13 @@ class SiunitxQuantity(Quantity):
         "degree_Celsius": "celsius",
         "delta_degree_Celsius": "celsius",
         "electron_volt": "electronvolt",
+        "light_year": "lightyear",
+        "meter_Hg": "mHg",
         "metric_ton": "tonne",
         "revolutions_per_minute": "rpm",
         "speed_of_light": "celerity",
         "standard_atmosphere": "atm",
         "unified_atomic_mass_unit": "amu",
-        "meter_Hg": "mHg",
         "watt_hour": "watthour",
     }
 
@@ -81,8 +82,8 @@ class SiunitxQuantity(Quantity):
             return alt
 
     def __iter__(self) -> Iterator["SiunitxQuantity"]:
-        # NOTE: this is used to set formatting options in tuple expansions:
-        # rx, ry = qty([3, 2], "kilometer", fmt=".1e")
+        # NOTE: this is used to set formatting options in tuple expansions rx,
+        # ry = qty([3, 2], "kilometer", fmt=".1e")
         for val in super().__iter__():
             val._fmt = self._fmt
             val._base = self._base
@@ -98,33 +99,35 @@ class SiunitxQuantity(Quantity):
         elif self._preferred:
             quantity = self._REGISTRY.to_preferred_units(self)
         if self._compact:
+            if isinstance(self.m, Iterable):
+                raise ValueError("'compact=True' for vectors has an undefined behavior")
             quantity = cast(SiunitxQuantity, self.to_compact())
 
         quantity._fmt = self._fmt
         return (
             quantity._format_array()
-            if isinstance(quantity.m, ndarray)
+            if isinstance(quantity.m, Iterable)
             else quantity._format_scalar()
         )
 
+    def _format_magnitude(self, m: float) -> str:
+        out = f"{m:{self._fmt}}"
+        if out.startswith("1e"):
+            return out[1:]
+        elif out.startswith("-1e"):
+            return "-" + out[2:]
+        return out
+
     def _format_array(self) -> str:
         if self.m.ndim != 1:
             raise NotImplementedError
         out = r"\begin{pmatrix}"
         if isinstance(self.m[0], complex):
             out += "\\\\".join(
-                [
-                    rf"\complexnum{{{v:{self._fmt}}}}" if abs(v) > 1e-16 else r"\num{0}"
-                    for v in self.m
-                ]
+                rf"\complexnum{{{self._format_magnitude(m)}}}" for m in self.m
             )
         else:
-            out += "\\\\".join(
-                [
-                    rf"\num{{{v:{self._fmt}}}}" if abs(v) > 1e-16 else r"\num{0}"
-                    for v in self.m
-                ]
-            )
+            out += "\\\\".join(rf"\num{{{self._format_magnitude(m)}}}" for m in self.m)
 
         out += r"\end{pmatrix}"
         if ustr := self._format_unit():
@@ -132,9 +135,7 @@ class SiunitxQuantity(Quantity):
         return out
 
     def _format_scalar(self) -> str:
-        out = f"{self.m:{self._fmt}}"
-        if out.startswith("1e"):
-            out = out[1:]
+        out = self._format_magnitude(self.m)
         if ustr := self._format_unit():
             if isinstance(self.m, complex):
                 return rf"\complexqty{{{out}}}{{{ustr}}}"
@@ -156,6 +157,21 @@ class SiunitxQuantity(Quantity):
         # "PlainQuantity[Unknown]"'
         return cast(SiunitxQuantity, super().__add__(other))
 
+    def __truediv__(self, other: object) -> "SiunitxQuantity":
+        # NOTE: to fix typing warning 'Cannot access attribute "???" for class
+        # "PlainQuantity[Unknown]"'
+        return cast(SiunitxQuantity, super().__truediv__(other))
+
+    def __mul__(self, other: object) -> "SiunitxQuantity":
+        # NOTE: to fix typing warning 'Cannot access attribute "???" for class
+        # "PlainQuantity[Unknown]"'
+        return cast(SiunitxQuantity, super().__mul__(other))
+
+    def __rmul__(self, other: object) -> "SiunitxQuantity":
+        # NOTE: to fix typing warning 'Cannot access attribute "???" for class
+        # "PlainQuantity[Unknown]"'
+        return cast(SiunitxQuantity, super().__rmul__(other))
+
     def _format_unit(self) -> str:
         num = ""
         den = ""

{physpyx-2.3.0 → physpyx-3.1.0}/src/physpyx/registry.py

@@ -2,6 +2,7 @@ from typing import Any, cast
 
 from pint.facets.context import Context
 from pint.registry import GenericUnitRegistry, Unit
+from pint.util import UnitsContainer
 
 from physpyx.context import SiunitxContext
 from physpyx.quantity import SiunitxQuantity
@@ -23,31 +24,32 @@ class SiunitxUnitRegistry(GenericUnitRegistry):
         self.define("an = year")
         self.define("ans = years")
         self.define("celerity = speed_of_light")
-        self.define("chf = [currency] = franc")
-        self.define("ct = 0.01 * chf = centime")
+        self.define("swissfranc = [currency]")
+        self.define("swisscent = swissfranc * 0.01")
         self._preferred_units = {
             Unit(name).dimensionality: name
             for name in [
-                "meter",
-                "second",
-                "kilogram",
                 "ampere",
+                "coulomb",
+                "farad",
+                "henry",
+                "joule",
                 "kelvin",
-                "mole",
-                "meter per second",
+                "kilogram",
                 "meter per second squared",
+                "meter per second",
+                "meter",
+                "mole",
                 "newton",
-                "joule",
-                "watt",
-                "pascal",
-                "volt",
                 "ohm",
+                "pascal",
+                "second",
                 "tesla",
-                "henry",
-                "farad",
-                "coulomb",
+                "volt",
+                "watt",
             ]
         }
+        self._preferred_units[UnitsContainer({"[currency]": 1})] = "swissfranc"
 
     def enable_contexts(self, *names_or_contexts: str | Context, **kwargs: Any) -> None:
         for context in names_or_contexts: