MatplotLibAPI 3.1.1__tar.gz → 3.1.2__tar.gz

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2}/MatplotLibAPI/Bubble.py

@@ -6,8 +6,7 @@ import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 import seaborn as sns
 
-from . import DynamicFuncFormatter, StyleTemplate, generate_ticks, string_formatter, bmk_formatter, percent_formatter, format_func
-from .. import validate_dataframe
+from . import DynamicFuncFormatter, StyleTemplate, generate_ticks, string_formatter, bmk_formatter, percent_formatter, format_func,validate_dataframe
 
 BUBBLE_STYLE_TEMPLATE = StyleTemplate(
     format_funcs={"label": string_formatter,

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2}/MatplotLibAPI/Composite.py

@@ -8,8 +8,7 @@ from matplotlib.figure import Figure
 from .Network import plot_network, plot_network_components, DEFAULT
 from .Bubble import plot_bubble, BUBBLE_STYLE_TEMPLATE
 from .Table import plot_table
-from . import StyleTemplate, format_func
-from .. import validate_dataframe
+from . import StyleTemplate, format_func, validate_dataframe
 
 
 def plot_composite_bubble(

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2}/MatplotLibAPI/Network.py

@@ -13,8 +13,7 @@ from networkx import Graph
 from networkx.classes.graph import Graph
 
 
-from . import StyleTemplate, string_formatter, format_func
-from .. import validate_dataframe
+from . import StyleTemplate, string_formatter, format_func,validate_dataframe
 
 NETWORK_STYLE_TEMPLATE = StyleTemplate(
 )

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2}/MatplotLibAPI/Table.py

@@ -3,8 +3,7 @@ import pandas as pd
 import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 
-from . import StyleTemplate,  string_formatter
-from .. import validate_dataframe
+from . import StyleTemplate,  string_formatter,validate_dataframe
 
 TABLE_STYLE_TEMPLATE = StyleTemplate(
     background_color='black',

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2}/MatplotLibAPI/Timeserie.py

@@ -6,8 +6,7 @@ import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 import seaborn as sns
 
-from . import DynamicFuncFormatter, StyleTemplate, string_formatter, bmk_formatter, format_func
-from .. import validate_dataframe
+from . import DynamicFuncFormatter, StyleTemplate, string_formatter, bmk_formatter, format_func,validate_dataframe
 
 
 TIMESERIE_STYLE_TEMPLATE = StyleTemplate(

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2}/MatplotLibAPI/Treemap.py

@@ -2,10 +2,11 @@
 # %%
 from typing import Optional
 import pandas as pd
+from pandas import CategoricalDtype,BooleanDtype
 import plotly.graph_objects as go
 
-from . import StyleTemplate, string_formatter, percent_formatter
-from .. import validate_dataframe
+from . import StyleTemplate, string_formatter, percent_formatter,validate_dataframe
+
 
 
 TREEMAP_STYLE_TEMPLATE = StyleTemplate(
@@ -49,9 +50,9 @@ def plot_treemap(pd_df: pd.DataFrame,
 
     if color and color in pd_df.columns:
         color_data = pd_df[color]
-        if pd.api.types.is_categorical_dtype(color_data) or pd.api.types.is_object_dtype(color_data):
+        if isinstance(color_data, CategoricalDtype) or pd.api.types.is_object_dtype(color_data):
             color_data = color_data.astype('category').cat.codes
-        elif pd.api.types.is_bool_dtype(color_data):
+        elif isinstance(color_data, BooleanDtype):
             color_data = color_data.astype(int)
         data['marker'] = dict(colorscale="Viridis",
                               colors=color_data.to_list())

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2}/MatplotLibAPI/__init__.py

@@ -1,4 +1,10 @@
 
+from .Treemap import plot_treemap, TREEMAP_STYLE_TEMPLATE
+from .Network import Graph
+from .Table import plot_table, TABLE_STYLE_TEMPLATE
+from .Timeserie import plot_timeserie, TIMESERIE_STYLE_TEMPLATE
+from .Composite import plot_composite_bubble
+from .Bubble import plot_bubble, BUBBLE_STYLE_TEMPLATE
 from typing import List, Optional, Dict, Callable, Union
 from dataclasses import dataclass
 import pandas as pd
@@ -11,16 +17,19 @@ from matplotlib.dates import num2date
 from matplotlib.ticker import FuncFormatter
 import plotly.graph_objects as go
 
-from . import StyleTemplate
-from .Bubble import plot_bubble, BUBBLE_STYLE_TEMPLATE
-from .Composite import plot_composite_bubble
-from .Timeserie import plot_timeserie, TIMESERIE_STYLE_TEMPLATE
-from .Table import plot_table, TABLE_STYLE_TEMPLATE
-from .Network import Graph
-from .Treemap import plot_treemap, TREEMAP_STYLE_TEMPLATE
 
 # region Utils
 
+def validate_dataframe(pd_df: pd.DataFrame,
+                       cols: List[str],
+                       sort_by: Optional[str] = None):
+    _columns = cols.copy()
+    if sort_by and sort_by not in _columns:
+        _columns.append(sort_by)
+    for col in _columns:
+        if col not in pd_df.columns:
+            raise AttributeError(f"{col} is not a DataFrame's column")
+
 
 def format_func(
         format_funcs: Optional[Dict[str, Optional[Callable[[Union[int, float, str]], str]]]],

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2/MatplotLibAPI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MatplotLibAPI
-Version: 3.1.1
+Version: 3.1.2
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE

{matplotlibapi-3.1.1/MatplotLibAPI.egg-info → matplotlibapi-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MatplotLibAPI
-Version: 3.1.1
+Version: 3.1.2
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE

{matplotlibapi-3.1.1 → matplotlibapi-3.1.2}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "MatplotLibAPI"
-version="v3.1.1"
+version="v3.1.2"
 readme = "README.md"
 requires-python=">=3.7"
 dependencies = ["pandas","matplotlib","networkx","plotly","seaborn","scikit-learn","kaleido","nbformat"]