From 8b745676336a3435dfabfe94f29dcd95966c77bc Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 10 Jan 2024 01:52:56 -0700 Subject: [PATCH 1/4] add tests for exp_val=0 --- tests/test_float_formatter.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/test_float_formatter.py b/tests/test_float_formatter.py index 75bda1a4..1127247d 100644 --- a/tests/test_float_formatter.py +++ b/tests/test_float_formatter.py @@ -183,6 +183,22 @@ def test_parts_per_exp(self): ( 123e-3, [ + ( + Formatter( + exp_mode="scientific", + exp_val=3, + exp_format="parts_per", + ), + "0.000123e+03", + ), + ( + Formatter( + exp_mode="scientific", + exp_val=0, + exp_format="parts_per", + ), + "0.123", + ), ( Formatter( exp_mode="scientific", From e54b051245995119aaf37a32d2c07e4b8a612378 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 10 Jan 2024 01:53:06 -0700 Subject: [PATCH 2/4] change prefix for zero exp --- src/sciform/prefix.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sciform/prefix.py b/src/sciform/prefix.py index d733fb92..c77ce25d 100644 --- a/src/sciform/prefix.py +++ b/src/sciform/prefix.py @@ -37,6 +37,7 @@ } pp_val_to_prefix_dict = { + 0: "", -6: "ppm", -9: "ppb", -12: "ppt", From d3057ece4bfaa8019c28529b077f11701a6638d2 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 10 Jan 2024 01:56:23 -0700 Subject: [PATCH 3/4] document 10^0 --- docs/source/exp replacement.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/source/exp replacement.rst b/docs/source/exp replacement.rst index 4a1fd9b4..34c13f5a 100644 --- a/docs/source/exp replacement.rst +++ b/docs/source/exp replacement.rst @@ -122,6 +122,9 @@ Parts Per Forms * - Exponent Value - Prefix Name - Prefix + * - 10\ :sup:`0` + - unity + - ``no symbol`` * - 10\ :sup:`-6` - parts-per-million - ppm From de4b4c9f9766d11b02f6b0a96dbec6d245972271 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 10 Jan 2024 02:07:18 -0700 Subject: [PATCH 4/4] changelog --- CHANGELOG.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 54bf35b8..fe482ea4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -31,6 +31,16 @@ Removed more confusing to understand. [`#97 `_] +Changed +^^^^^^^ + +* **[BREAKING]** Previously ``12.3`` would format as ``"12.3e+00"`` + when using parts per formatting mode. + Now, when using parts per formatting mode, the ``e+00`` exponent is + translated to be an empty string so that ``12.3`` would format as + ``"12.3"``. + [`#99 `_] + ---- 0.31.1 (2024-01-06)