format-multiple-errors 0.0.2__tar.gz → 0.0.3__tar.gz

{format_multiple_errors-0.0.2 → format_multiple_errors-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: format_multiple_errors
-Version: 0.0.2
+Version: 0.0.3
 Summary: A small widget to be able to format multiple, asymmetric errors easily.
 Author-email: Ed Bennett <e.j.bennett@swansea.ac.uk>
 Project-URL: Homepage, https://github.com/edbennett/format_multiple_errors
@@ -11,6 +11,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: tables
+Requires-Dist: pandas; extra == "tables"
+Requires-Dist: jinja2; extra == "tables"
 
 # format_multiple_errors
 
@@ -28,9 +31,16 @@ $$(6.829 \pm 0.013 {}^{+0.104}_{-0.096})\times10^{5}$$
 
 ## Installation
 
-To install, open a terminal and run:
+To install the bare library, open a terminal and run:
 
-    pip install https://github.com/edbennett/format_multiple_errors
+    pip install format-multiple-errors
+
+If you will be formatting tables,
+additional dependencies are required.
+To install these,
+instead run
+
+    pip install format-multiple-errors[tables]
 
 
 ## Usage as a library

{format_multiple_errors-0.0.2 → format_multiple_errors-0.0.3}/README.md

@@ -14,9 +14,16 @@ $$(6.829 \pm 0.013 {}^{+0.104}_{-0.096})\times10^{5}$$
 
 ## Installation
 
-To install, open a terminal and run:
+To install the bare library, open a terminal and run:
 
-    pip install https://github.com/edbennett/format_multiple_errors
+    pip install format-multiple-errors
+
+If you will be formatting tables,
+additional dependencies are required.
+To install these,
+instead run
+
+    pip install format-multiple-errors[tables]
 
 
 ## Usage as a library

{format_multiple_errors-0.0.2 → format_multiple_errors-0.0.3}/format_multiple_errors/__main__.py

@@ -10,8 +10,10 @@ from sys import exit, stderr
 
 try:
     import pandas as pd
+
+    have_pandas = True
 except ImportError:
-    pd = None
+    have_pandas = False
 
 from .formatter import format_multiple_errors
 from .pandas import format_dataframe_errors, ColumnSpec
@@ -34,7 +36,7 @@ def _format_numbers(args: Namespace) -> None:
 
 def _check_pandas() -> None:
     """Check if Pandas is available; complain and exit if not."""
-    if pd is None:
+    if not have_pandas:
         print(
             "Pandas is not installed, but is required to process a table.",
             file=stderr,
@@ -76,7 +78,7 @@ def _float_or_pair(arg: str) -> float | tuple[float, float]:
     if len(split_arg) == 1:
         return float(arg)
     elif len(split_arg) == 2:
-        return tuple(map(float, split_arg))
+        return (float(split_arg[0]), float(split_arg[1]))
     else:
         message = f"Can't parse {arg} as a number or pair of numbers."
         raise ValueError(message)
@@ -94,13 +96,19 @@ def _parse_columnspec(arg: str) -> str | ColumnSpec:
     if not isinstance(split_arg[0], str):
         raise ValueError("First column has to be a single central value.")
 
-    error_columns = []
+    error_columns: list[str | tuple[str, str]] = []
     for error_spec in split_arg[1:]:
         split_error = error_spec.split("-")
         if len(split_error) == 1:
             error_columns.append(error_spec)
+        elif len(split_error) == 2:
+            error_columns.append((split_error[0], split_error[1]))
         else:
-            error_columns.append(tuple(split_error))
+            message = (
+                f"Expected one or two components in error_spec {error_spec}, "
+                f"found {len(split_error)}."
+            )
+            raise ValueError(message)
 
     return ColumnSpec(split_arg[0], *error_columns)
 

{format_multiple_errors-0.0.2 → format_multiple_errors-0.0.3}/format_multiple_errors/pandas.py

@@ -57,7 +57,7 @@ def _format_column(value: pd.Series, *errors: pd.Series, **fme_kwargs) -> pd.Ser
     return pd.Series(data=formatted_errors, index=index)
 
 
-def _tuplify(columns: list[pd.Series]) -> pd.Series:
+def _tuplify(columns: list[pd.Series] | tuple[pd.Series]) -> pd.Series:
     """
     Turn columns into one column of tuples.
     Given a list of Pandas Series, returns a single Series
@@ -142,7 +142,13 @@ class ColumnSpec:
     Specification of columns to include in calls to `format_dataframe_errors()`
     """
 
-    def __init__(self, value: str, *errors: str, name: str | None = None, **fme_kwargs):
+    def __init__(
+        self,
+        value: str,
+        *errors: str | tuple[str, str],
+        name: str | None = None,
+        **fme_kwargs,
+    ):
         """
         Specify a set of columns to turn into a single column containing formatted
         values and uncertainties.

{format_multiple_errors-0.0.2 → format_multiple_errors-0.0.3}/format_multiple_errors.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: format_multiple_errors
-Version: 0.0.2
+Version: 0.0.3
 Summary: A small widget to be able to format multiple, asymmetric errors easily.
 Author-email: Ed Bennett <e.j.bennett@swansea.ac.uk>
 Project-URL: Homepage, https://github.com/edbennett/format_multiple_errors
@@ -11,6 +11,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: tables
+Requires-Dist: pandas; extra == "tables"
+Requires-Dist: jinja2; extra == "tables"
 
 # format_multiple_errors
 
@@ -28,9 +31,16 @@ $$(6.829 \pm 0.013 {}^{+0.104}_{-0.096})\times10^{5}$$
 
 ## Installation
 
-To install, open a terminal and run:
+To install the bare library, open a terminal and run:
 
-    pip install https://github.com/edbennett/format_multiple_errors
+    pip install format-multiple-errors
+
+If you will be formatting tables,
+additional dependencies are required.
+To install these,
+instead run
+
+    pip install format-multiple-errors[tables]
 
 
 ## Usage as a library

{format_multiple_errors-0.0.2 → format_multiple_errors-0.0.3}/format_multiple_errors.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ format_multiple_errors.egg-info/PKG-INFO
 format_multiple_errors.egg-info/SOURCES.txt
 format_multiple_errors.egg-info/dependency_links.txt
 format_multiple_errors.egg-info/entry_points.txt
+format_multiple_errors.egg-info/requires.txt
 format_multiple_errors.egg-info/top_level.txt
 tests/test_cli.py
 tests/test_format.py

format_multiple_errors-0.0.3/format_multiple_errors.egg-info/requires.txt

@@ -0,0 +1,4 @@
+
+[tables]
+pandas
+jinja2

{format_multiple_errors-0.0.2 → format_multiple_errors-0.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "format_multiple_errors"
-version = "0.0.2"
+version = "0.0.3"
 authors = [{name="Ed Bennett", email="e.j.bennett@swansea.ac.uk"}]
 description = "A small widget to be able to format multiple, asymmetric errors easily."
 readme = "README.md"
@@ -22,6 +22,9 @@ classifiers = [
 [project.scripts]
 format_multiple_errors = "format_multiple_errors.__main__:cli"
 
+[project.optional-dependencies]
+tables = ["pandas", "jinja2"]
+
 [tool.coverage.report]
 exclude_lines = [
     "if __name__ == .__main__.:"

{format_multiple_errors-0.0.2 → format_multiple_errors-0.0.3}/tests/test_pandas.py

@@ -131,7 +131,7 @@ def test_format_dataframe_columnspecs(df):
         "b",
         ColumnSpec("c_value", "c_error", name="c", abbreviate=True),
         ColumnSpec(
-            "d_value", "d_asymmetric", "d_systematic", name="d", abbreviate=True
+            "d_value", ("d_upper", "d_lower"), "d_systematic", name="d", abbreviate=True
         ),
     ]
     result = format_dataframe_errors(df, columns, abbreviate=False)