sciform 0.28.2__py3-none-any.whl → 0.29.0__py3-none-any.whl

sciform/format_options.py

@@ -262,7 +262,7 @@ class FormatOptions:
                 **_merge_dicts(asdict(defaults), asdict(self))
             )
         except ValueError as e:
-            raise ValueError('Invalid format options resuling from merging '
+            raise ValueError('Invalid format options resulting from merging '
                              'with default options.') from e
 
         return rendered_format_options
@@ -275,7 +275,7 @@ def validate_options(options: Union[FormatOptions, RenderedFormatOptions]):
     if options.round_mode is RoundMode.SIG_FIG:
         if isinstance(options.ndigits, int):
             if options.ndigits < 1:
-                raise ValueError(f'Precision must be >= 1 for sig fig '
+                raise ValueError(f'ndigits must be >= 1 for sig fig '
                                  f'rounding, not {options.ndigits}.')
 
     if (options.pdg_sig_figs and options.ndigits is not None

sciform/formatting.py

@@ -318,7 +318,10 @@ def format_val_unc(val: Decimal, unc: Decimal,
             extra_iec_prefixes=options.extra_iec_prefixes,
             extra_parts_per_forms=options.extra_parts_per_forms
         )
-        val_unc_exp_str = f'({val_unc_str}){exp_str}'
+        if options.bracket_unc and not re.match(r'^[eEbB][+-]\d+$', exp_str):
+            val_unc_exp_str = f'{val_unc_str}{exp_str}'
+        else:
+            val_unc_exp_str = f'({val_unc_str}){exp_str}'
     else:
         val_unc_exp_str = val_unc_str
 

{sciform-0.28.2.dist-info → sciform-0.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciform
-Version: 0.28.2
+Version: 0.29.0
 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
@@ -77,7 +77,7 @@ continue to change until version ``1.0.0`` is released.
 API changes will be announced after new releases in the
 `changelog <https://sciform.readthedocs.io/en/stable/project.html#changelog>`_.
 If you have an idea or opinion about how ``sciform`` should be designed,
-now is a great to
+now is a great time to
 `post a discussion topic <https://github.com/jagerber48/sciform/discussions>`_
 about it!
 

{sciform-0.28.2.dist-info → sciform-0.29.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 sciform/__init__.py,sha256=kAgKCR6uDXlmzpUIrHwMG607sTvPc5UEOZGE5zKDJ8s,1104
-sciform/format_options.py,sha256=A_Kw15VOXPWmQ8hx0fpQpxuTsDQIRqYUxkAiH3EdfTo,19220
+sciform/format_options.py,sha256=Yk0Xo-wkremjo0Lw_VoZ_8Fwj31gBIwQxnYm6jif19c,19219
 sciform/format_utils.py,sha256=MGJ0Tsoa6iYHn8PJqa6XDr-cT3bRQwLd0u0sqhQomHE,11599
 sciform/formatter.py,sha256=qLK94AqZQ4vv7fLEYIXEJzL0abfE7vfB62npwmzHveE,2091
-sciform/formatting.py,sha256=3PHf6lbSHXNMBmo30DOmu8rvvsurWfQOaNKdGVeGp6A,11552
+sciform/formatting.py,sha256=82K38NFsgDuO7P5L2hGuVHY44hPm9vfzVLCZPkN-EFY,11704
 sciform/fsml.py,sha256=8IbONNU1pSGRmF6_3t-8go_nLOe0yISAkEEUS2bPWdw,4697
 sciform/grouping.py,sha256=t_M33mUIa0e7y8YuYe395dpOrX0QJiwPHC76NRPMcWs,2324
 sciform/modes.py,sha256=xLeffIzlbNSApoBvl0u0GAQrk92XveLKeP0kjyeiz_c,4105
 sciform/prefix.py,sha256=5JpmaqGpoZ7uApq6YkaGb0txjL-VT1AkEsRO6gihX7Q,1186
 sciform/scinum.py,sha256=bTprldmCgLYPSyM9j8qLt--DqnTfBVfMGoneqby8oFI,2068
-sciform-0.28.2.dist-info/LICENSE,sha256=-oyCEZu-6HLrRSfRg44uuNDE0c59GVEdqYIgidqSP70,1056
-sciform-0.28.2.dist-info/METADATA,sha256=-Xt7KDqCAz5RrOfOgJRp50Swffy1UgFd141aAuSGpXA,5761
-sciform-0.28.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-sciform-0.28.2.dist-info/top_level.txt,sha256=mC01YOQ-1u5pDk9BJia-pQKLUMvkreMsldDpFcp7NV8,8
-sciform-0.28.2.dist-info/RECORD,,
+sciform-0.29.0.dist-info/LICENSE,sha256=-oyCEZu-6HLrRSfRg44uuNDE0c59GVEdqYIgidqSP70,1056
+sciform-0.29.0.dist-info/METADATA,sha256=ELJLYio4-4qGbqggyPh-54wG5Ie24BtOl2W-jbvaFXI,5766
+sciform-0.29.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+sciform-0.29.0.dist-info/top_level.txt,sha256=mC01YOQ-1u5pDk9BJia-pQKLUMvkreMsldDpFcp7NV8,8
+sciform-0.29.0.dist-info/RECORD,,