fix mypy, black

Author: cgevans

src/alhambra_mixes/mixes.py

@@ -330,7 +330,7 @@ def emphasize(text: str, tablefmt: str | TableFormat, strong: bool = False) -> s
     """
     # formats a title for a table produced using tabulate,
     # in the formats tabulate understands
-    if tablefmt in ["html", "unsafehtml", html_with_borders_tablefmt]: # type: ignore
+    if tablefmt in ["html", "unsafehtml", html_with_borders_tablefmt]:  # type: ignore
         if strong:
             emph_text = f"<strong>{text}</strong>"
         else:

src/alhambra_mixes/quantitate.py

@@ -41,16 +41,23 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterable, Sequence, Type, cast
+from typing import Any, Iterable, Sequence, Type, Union, cast
 import pint
 import warnings
 import pandas
 from decimal import Decimal as D
 import decimal
 
 from pint import Quantity
-from .mixes import Q_, ureg, DNAN, uL, uM, nM, _parse_conc_optional
-from .mixes import _parse_vol_optional as parse_vol
+from .mixes import Q_, ureg, DNAN, uL, uM, nM
+from .mixes import _parse_vol_optional
+
+
+def parse_vol(vol: Union[float, int, str, Quantity[D]]) -> Quantity[D]:
+    if isinstance(vol, (float, int)):
+        vol = Quantity(D(vol), "µL")
+    return _parse_vol_optional(vol)
+
 
 __all__ = (
     "measure_conc_and_dilute",

tests/test_mixes.py

@@ -82,11 +82,13 @@ def test_invalid_wellrefs():
     with pytest.raises(ValueError):
         WellPos("i123nvalid string")
 
-def _itertools_pairwise(iterable): # FIXME: in 3.10
+
+def _itertools_pairwise(iterable):  # FIXME: in 3.10
     a, b = itertools.tee(iterable)
     next(b, None)
     return zip(a, b)
 
+
 def test_all_wellref_96():
     allbyrow96 = [f"{r}{c}" for r in "ABCDEFGH" for c in range(1, 13)]
     for x, y in _itertools_pairwise(allbyrow96):