mergeron_extra 2024.739099.6__tar.gz → 2024.739148.3__tar.gz

{mergeron_extra-2024.739099.6 → mergeron_extra-2024.739148.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron_extra
-Version: 2024.739099.6
+Version: 2024.739148.3
 Summary: Tools for users of the mergeron package.
 License: MIT
 Author: Murthy Kambhampaty
@@ -20,12 +20,12 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: aenum (>=3.1.15,<4.0.0)
 Requires-Dist: certifi (>=2023.11.17)
 Requires-Dist: matplotlib (>=3.8)
-Requires-Dist: numpy (>=1.26,<2)
+Requires-Dist: numpy (>=2.0)
 Requires-Dist: scipy (>=1.12)
 Requires-Dist: xlsxwriter (>=3.1)
 Description-Content-Type: text/x-rst
 
-mergeron_extra: Support package for users of `mergeron`
+mergeron-extra: Support package for users of `mergeron`
 =======================================================
 
 Modules potentially useful to users of the :code:`mergeron` package, but which do not implement the principal functions of the package, and are hence considered "extras"  or "external" modules. One of these modules is, in fact, repackaged here although published independently.

{mergeron_extra-2024.739099.6 → mergeron_extra-2024.739148.3}/README.rst

@@ -1,4 +1,4 @@
-mergeron_extra: Support package for users of `mergeron`
+mergeron-extra: Support package for users of `mergeron`
 =======================================================
 
 Modules potentially useful to users of the :code:`mergeron` package, but which do not implement the principal functions of the package, and are hence considered "extras"  or "external" modules. One of these modules is, in fact, repackaged here although published independently.

{mergeron_extra-2024.739099.6 → mergeron_extra-2024.739148.3}/pyproject.toml

@@ -4,7 +4,7 @@ description = "Tools for users of the mergeron package."
 authors = ["Murthy Kambhampaty <smk@capeconomics.com>"]
 license = "MIT"
 readme = "README.rst"
-version = "2024.739099.6"
+version = "2024.739148.3"
 
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -30,7 +30,7 @@ build-backend = "poetry.core.masonry.api"
 # if poetry dependency resolution appears to hang (read the page at link to the end)
 aenum = "^3.1.15"
 matplotlib = ">=3.8"
-numpy = ">=1.26, <2"
+numpy = ">=2.0"
 python = "^3.12"
 scipy = ">=1.12"
 xlsxwriter = ">=3.1"
@@ -147,6 +147,7 @@ preview = true
 python_version = "3.12"
 ignore_missing_imports = false
 strict = true
+enable_incomplete_feature = ["NewGenericSyntax", "PreciseTupleTypes"]
 
 show_column_numbers = true
 show_error_codes = true

{mergeron_extra-2024.739099.6 → mergeron_extra-2024.739148.3}/src/mergeron_extra/__init__.py

@@ -1,25 +1,12 @@
 from __future__ import annotations
 
-from pathlib import Path
-
 import numpy as np
 from numpy.typing import NDArray
 
-_PKG_NAME: str = Path(__file__).parent.stem
-
-VERSION = "2024.739097.4"
+VERSION = "2024.739148.3"
 
 __version__ = VERSION
 
-DATA_DIR: Path = Path.home() / _PKG_NAME
-"""
-Defines a subdirectory named for this package in the user's home path.
-
-If the subdirectory doesn't exist, it is created on package invocation.
-"""
-if not DATA_DIR.is_dir():
-    DATA_DIR.mkdir(parents=False)
-
 np.set_printoptions(precision=24, floatmode="fixed")
 
 type ArrayBoolean = NDArray[np.bool_]

{mergeron_extra-2024.739099.6 → mergeron_extra-2024.739148.3}/src/mergeron_extra/tol_colors.py

@@ -685,8 +685,11 @@ Lcset = namedtuple(
 )
 
 
-def tol_cset(  # noqa: PLR0911
-    colorset: str | None = None,
+def tol_cset(
+    colorset: Literal[
+        "bright", "high-contrast", "vibrant", "muted", "medium-contrast", "light"
+    ]
+    | None = None,
 ) -> Sequence[str] | Bcset | Hcset | Vcset | Muset | Mcset | Lcset:
     """
     Discrete color sets for qualitative data.
@@ -719,16 +722,16 @@ def tol_cset(  # noqa: PLR0911
     )
 
     if colorset is None:
-        return namelist
+        _retval = namelist
 
     elif colorset == "bright":
-        return Bcinst
+        _retval = Bcinst
 
     elif colorset == "high-contrast":
-        return Hcset("#004488", "#DDAA33", "#BB5566", "#000000")
+        _retval = Hcset("#004488", "#DDAA33", "#BB5566", "#000000")
 
     elif colorset == "vibrant":
-        return Vcset(
+        _retval = Vcset(
             "#EE7733",
             "#0077BB",
             "#33BBEE",
@@ -740,7 +743,7 @@ def tol_cset(  # noqa: PLR0911
         )
 
     elif colorset == "muted":
-        return Muset(
+        _retval = Muset(
             "#CC6677",
             "#332288",
             "#DDCC77",
@@ -755,12 +758,12 @@ def tol_cset(  # noqa: PLR0911
         )
 
     elif colorset == "medium-contrast":
-        return Mcset(
+        _retval = Mcset(
             "#6699CC", "#004488", "#EECC66", "#994455", "#997700", "#EE99AA", "#000000"
         )
 
     elif colorset == "light":
-        return Lcset(
+        _retval = Lcset(
             "#77AADD",
             "#EE8866",
             "#EEDD88",
@@ -779,7 +782,9 @@ def tol_cset(  # noqa: PLR0911
             "known colorsets are {}.".format(namelist),  # noqa: UP032
             "Using {}.".format(colorset),  # noqa: UP032
         )
-        return Bcinst
+        _retval = Bcinst
+
+    return _retval
 
 
 def main() -> None: