sciform 0.39.0__tar.gz → 0.39.1__tar.gz

{sciform-0.39.0 → sciform-0.39.1}/CHANGELOG.rst

@@ -12,6 +12,17 @@ Unreleased
   documentation
   `changelog <https://sciform.readthedocs.io/en/latest/project.html#changelog>`_.
 
+0.39.1 (2025-09-11)
+-------------------
+
+Fixed
+-----
+
+* Fixed a value/uncertainty formatting bug when one of the value/uncertainty is 0, the
+  other one is 0 or non-finite and a positive fixed exponent is used. In this case the
+  zero values would erroneously be formatted with trailing zeros.
+  [`#205 <https://github.com/jagerber48/sciform/issues/205>`_]
+
 ----
 
 0.39.0 (2024-11-15)

{sciform-0.39.0 → sciform-0.39.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sciform
-Version: 0.39.0
+Version: 0.39.1
 Summary: A package for formatting numbers into scientific formatted strings.
 Author-email: Justin Gerber <justin.gerber48@gmail.com>
 Project-URL: homepage, https://github.com/jagerber48/sciform
@@ -41,6 +41,7 @@ Provides-Extra: all
 Requires-Dist: sciform[docs]; extra == "all"
 Requires-Dist: sciform[test]; extra == "all"
 Requires-Dist: sciform[examples]; extra == "all"
+Dynamic: license-file
 
 .. container::
 

{sciform-0.39.0 → sciform-0.39.1}/src/sciform/formatting/number_formatting.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from dataclasses import replace
 from decimal import Decimal
+from math import isfinite
 from typing import TYPE_CHECKING, cast
 
 from sciform.api.formatted_number import FormattedNumber
@@ -177,7 +178,7 @@ def format_num(num: Decimal, options: FinalizedOptions) -> str:
     return result
 
 
-def format_val_unc(val: Decimal, unc: Decimal, options: FinalizedOptions) -> str:
+def format_val_unc(val: Decimal, unc: Decimal, options: FinalizedOptions) -> str:  # noqa: PLR0915
     """Format value/uncertainty pair according to input options."""
     exp_mode = options.exp_mode
 
@@ -259,7 +260,12 @@ def format_val_unc(val: Decimal, unc: Decimal, options: FinalizedOptions) -> str
         ndigits that will be used for separate digits-past-the-decimal rounding for the
         value and uncertainty.
         """
-        ndigits = -round_digit + exp_val
+        if (isfinite(val) and val_rounded != 0) or (
+            isfinite(unc_rounded) and unc_rounded != 0
+        ):
+            ndigits = -round_digit + exp_val
+        else:
+            ndigits = 0
 
     val_mantissa, _ = get_mantissa_exp(
         val_rounded,

{sciform-0.39.0 → sciform-0.39.1}/src/sciform.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sciform
-Version: 0.39.0
+Version: 0.39.1
 Summary: A package for formatting numbers into scientific formatted strings.
 Author-email: Justin Gerber <justin.gerber48@gmail.com>
 Project-URL: homepage, https://github.com/jagerber48/sciform
@@ -41,6 +41,7 @@ Provides-Extra: all
 Requires-Dist: sciform[docs]; extra == "all"
 Requires-Dist: sciform[test]; extra == "all"
 Requires-Dist: sciform[examples]; extra == "all"
+Dynamic: license-file
 
 .. container::
 

{sciform-0.39.0 → sciform-0.39.1}/tests/feature/test_val_unc_fsml.py

@@ -671,10 +671,31 @@ class TestValUncFSML(unittest.TestCase):
 
     def test_zero(self):
         cases_list = [
+            (
+                (0, 0),
+                [
+                    ("!3f", "0 ± 0"),
+                    ("!3e", "(0 ± 0)e+00"),
+                    ("ex-2", "(0 ± 0)e-02"),
+                    ("ex+2", "(0 ± 0)e+02"),
+                ],
+            ),
             (
                 (0, float("nan")),
                 [
                     ("!3f", "0 ± nan"),
+                    ("!3e", "(0 ± nan)e+00"),
+                    ("ex-2", "(0 ± nan)e-02"),
+                    ("ex+2", "(0 ± nan)e+02"),
+                ],
+            ),
+            (
+                (float("inf"), 0),
+                [
+                    ("!3f", "inf ± 0"),
+                    ("!3e", "(inf ± 0)e+00"),
+                    ("ex-2", "(inf ± 0)e-02"),
+                    ("ex+2", "(inf ± 0)e+02"),
                 ],
             ),
         ]