PyPI - rolling-pin - Versions diffs - 0.9.6__py3-none-any.whl → 0.10.1__py3-none-any.whl - Mend

rolling-pin 0.9.6py3-none-any.whl → 0.10.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

rolling_pin/radon_etl.py +52 -39
rolling_pin/repo_etl.py +15 -4
rolling_pin/tools.py +75 -10
{rolling_pin-0.9.6.dist-info → rolling_pin-0.10.1.dist-info}/METADATA +4 -4
rolling_pin-0.10.1.dist-info/RECORD +15 -0
rolling_pin-0.9.6.dist-info/RECORD +0 -15
{rolling_pin-0.9.6.dist-info → rolling_pin-0.10.1.dist-info}/WHEEL +0 -0
{rolling_pin-0.9.6.dist-info → rolling_pin-0.10.1.dist-info}/entry_points.txt +0 -0
{rolling_pin-0.9.6.dist-info → rolling_pin-0.10.1.dist-info}/licenses/LICENSE +0 -0

rolling_pin/radon_etl.py CHANGED Viewed

@@ -5,13 +5,13 @@ import os
 import re
 from pathlib import Path
-import cufflinks as cf
+from pandas import DataFrame
+from radon.cli import CCHarvester, HCHarvester, MIHarvester, RawHarvester
+from radon.cli import Config
 import numpy as np
 import pandas as pd
-from pandas import DataFrame
+import plotly.express as px
 import radon.complexity
-from radon.cli import Config
-from radon.cli import CCHarvester, HCHarvester, MIHarvester, RawHarvester
 from rolling_pin.blob_etl import BlobETL
 import rolling_pin.tools as rpt
@@ -413,8 +413,6 @@ class RadonETL():
         Returns:
             RadonETL: self.
         '''
-        cf.go_offline()
         def remove_test_modules(data):
             # type: (DataFrame) -> DataFrame
             mask = data.fullpath\
@@ -436,13 +434,6 @@ class RadonETL():
             bugs='bugs (B) - V / 3000 - an estimate of the errors in the implementation',
         )
-        params = dict(
-            theme='henanigans',
-            colors=rpt.COLOR_SCALE,
-            dimensions=(900, 900),
-            asFigure=True,
-        )
         html = '<body style="background: #242424">\n'
         raw = remove_test_modules(self.raw_metrics)
@@ -452,42 +443,64 @@ class RadonETL():
         raw['docstring_ratio'] = raw.multiline_comment / raw.code
         raw.sort_values('docstring_ratio', inplace=True)
-        html += raw.iplot(
-            x='fullpath',
-            kind='barh',
+        # line count
+        fig = px.bar(
+            raw,
             title='Line Count Metrics',
-            **params
-        ).to_html()
+            x=raw.drop(columns='fullpath').columns.tolist(),
+            y='fullpath',
+            orientation='h',
+            barmode='group',
+            width=900,
+            height=900,
+            color_discrete_sequence=rpt.COLOR_SCALE,
+        )
+        fig.layout.update(rpt.PLOTLY_LAYOUT_THEME)
+        html += fig.to_html()
-        html += mi.iplot(
-            x='fullpath',
-            kind='barh',
+        # maintainability
+        fig = px.bar(
+            mi,
             title='Maintainability Metrics',
-            **params
-        ).to_html()
-        params['dimensions'] = (900, 500)
+            x='maintainability_index',
+            y='fullpath',
+            orientation='h',
+            barmode='group',
+            width=900,
+            height=900,
+            color_discrete_sequence=rpt.COLOR_SCALE,
+        )
+        fig.layout.update(rpt.PLOTLY_LAYOUT_THEME)
+        html += fig.to_html()
-        cols = ['cyclomatic_complexity', 'cyclomatic_rank']
-        html += cc[cols].iplot(
-            kind='hist',
-            bins=50,
+        # cyclomatic
+        fig = px.histogram(
+            cc[['cyclomatic_complexity', 'cyclomatic_rank']],
             title='Cyclomatic Metric Distributions',
-            **params
-        ).to_html()
+            nbins=10,
+            width=900,
+            height=500,
+            color_discrete_sequence=rpt.COLOR_SCALE,
+        )
+        fig.layout.update(rpt.PLOTLY_LAYOUT_THEME)
+        html += fig.to_html()
+        # halstead
         cols = [
             'h1', 'h2', 'n1', 'n2', 'vocabulary', 'length', 'calculated_length',
             'volume', 'difficulty', 'effort', 'time', 'bugs'
         ]
-        html += hal[cols]\
-            .rename(mapper=lambda x: lut[x], axis=1)\
-            .iplot(
-                kind='hist',
-                bins=50,
-                title='Halstead Metric Distributions',
-                **params)\
-            .to_html()
+        fig = px.histogram(
+            hal[cols].rename(mapper=lambda x: lut[x], axis=1),
+            title='Halstead Metric Distributions',
+            nbins=10,
+            width=1400,
+            height=500,
+            color_discrete_sequence=rpt.COLOR_SCALE,
+        )
+        fig.layout.update(rpt.PLOTLY_LAYOUT_THEME)
+        html += fig.to_html()
         html += '\n</body>'

rolling_pin/repo_etl.py CHANGED Viewed

@@ -335,17 +335,28 @@ class RepoETL():
         return data
     @staticmethod
-    def _to_networkx_graph(data):
-        # (DataFrame) -> networkx.DiGraph
+    def _to_networkx_graph(data, escape_chars=False):
+        # (DataFrame, bool) -> networkx.DiGraph
         '''
         Converts given DataFrame into networkx directed graph.
         Args:
-            DataFrame: DataFrame of nodes.
+            data (DataFrame): DataFrame of nodes.
+            escape_chars (bool, optional): Escape special characters. Used to
+                avoid dot file errors. Default: False.
         Returns:
             networkx.DiGraph: Graph of nodes.
         '''
+        # escape periods for dot file interpolation
+        if escape_chars:
+            data = data.copy()
+            data.node_name = data.node_name \
+                .fillna('') \
+                .apply(lambda x: re.sub(r'\.', '\\.', x))
+            data.dependencies = data.dependencies \
+                .apply(lambda x: [re.sub(r'\.', '\\.', y) for y in x])
         graph = networkx.DiGraph()
         data.apply(
             lambda x: graph.add_node(
@@ -406,7 +417,7 @@ class RepoETL():
             color_scheme = rpt.COLOR_SCHEME
         # create dot graph
-        graph = self.to_networkx_graph()
+        graph = self._to_networkx_graph(self._data, escape_chars=True)
         dot = networkx.drawing.nx_pydot.to_pydot(graph)
         # set layout orientation

rolling_pin/tools.py CHANGED Viewed

@@ -38,18 +38,83 @@ COLOR_SCHEME = dict(
     edge_module='#B6ECF3',
 )  # type: Dict[str, str]
+PLOTLY_COLOR_SCHEME = dict(
+    bg='#242424',
+    blue1='#5F95DE',
+    blue2='#93B6E6',
+    cyan1='#7EC4CF',
+    cyan2='#B6ECF3',
+    dark1='#040404',
+    dark2='#141414',
+    dialog1='#444459',
+    dialog2='#5D5D7A',
+    green1='#8BD155',
+    green2='#A0D17B',
+    grey1='#343434',
+    grey2='#444444',
+    light1='#A4A4A4',
+    light2='#F4F4F4',
+    orange1='#EB9E58',
+    orange2='#EBB483',
+    purple1='#C98FDE',
+    purple2='#AC92DE',
+    red1='#F77E70',
+    red2='#DE958E',
+    yellow1='#E8EA7E',
+    yellow2='#E9EABE',
+)
 COLOR_SCALE = [
-    '#B6ECF3',
-    '#DE958E',
-    '#EBB483',
-    '#A0D17B',
-    '#93B6E6',
-    '#AC92DE',
-    '#E9EABE',
-    '#7EC4CF',
-    '#F77E70',
-    '#EB9E58',
+    'cyan2', 'red2', 'green2', 'blue2', 'orange2', 'purple2', 'yellow2',
+    'light2', 'cyan1', 'red1', 'green1', 'blue1'
 ]  # type: List[str]
+COLOR_SCALE = [PLOTLY_COLOR_SCHEME[x] for x in COLOR_SCALE]
+PLOTLY_LAYOUT_THEME = {
+    'legend': {
+        'bgcolor': PLOTLY_COLOR_SCHEME['bg'],
+        'title': {'text': ''},
+        'font': {
+            'color': PLOTLY_COLOR_SCHEME['light2']
+        }
+    },
+    'paper_bgcolor': PLOTLY_COLOR_SCHEME['bg'],
+    'plot_bgcolor': PLOTLY_COLOR_SCHEME['bg'],
+    'title': {
+        'font': {
+            'color': PLOTLY_COLOR_SCHEME['light2']
+        }
+    },
+    'xaxis': {
+        'gridcolor': PLOTLY_COLOR_SCHEME['grey1'],
+        'showgrid': True,
+        'tickfont': {
+            'color': PLOTLY_COLOR_SCHEME['light1']
+        },
+        'title': {
+            'font': {
+                'color': PLOTLY_COLOR_SCHEME['light1']
+            }
+        },
+        'zerolinecolor': PLOTLY_COLOR_SCHEME['grey2']
+    },
+    'yaxis': {
+        'gridcolor': PLOTLY_COLOR_SCHEME['grey1'],
+        'showgrid': True,
+        'tickfont': {
+            'color': PLOTLY_COLOR_SCHEME['light1']
+        },
+        'title': {
+            'font': {
+                'color': PLOTLY_COLOR_SCHEME['light1']
+            }
+        },
+        'zerolinecolor': PLOTLY_COLOR_SCHEME['grey2']
+    }
+}
 # PREDICATE-FUNCTIONS-----------------------------------------------------------

{rolling_pin-0.9.6.dist-info → rolling_pin-0.10.1.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rolling-pin
-Version: 0.9.6
+Version: 0.10.1
 Summary: A library of generic tools for ETL work and visualization of JSON blobs and python repositories
 License: MIT
 Keywords: ETL,blob,dependency,graph,svg,networkx,transform,code metrics,dependency diagram,build system
@@ -15,14 +15,14 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Typing :: Typed
 Requires-Dist: click>=8.1.3
-Requires-Dist: cufflinks
 Requires-Dist: graphviz
 Requires-Dist: ipython
 Requires-Dist: lunchbox
 Requires-Dist: networkx
-Requires-Dist: numpy<=1.24.4,>=1.23.4
+Requires-Dist: numpy>=1.23.4
 Requires-Dist: pandas>=1.1.5
-Requires-Dist: pydot<=1.4.2
+Requires-Dist: plotly>=5.22.0
+Requires-Dist: pydot>=1.4.2
 Requires-Dist: pyyaml
 Requires-Dist: radon<6.0.0
 Requires-Dist: schematics

rolling_pin-0.10.1.dist-info/RECORD ADDED Viewed

@@ -0,0 +1,15 @@
+rolling_pin/__init__.py,sha256=R_g0FYses--dTmvbZLtFFI-FPn4og6p8zmkEesYmN1A,511
+rolling_pin/blob_etl.py,sha256=79eEeCZwPeJ8XwMlLp9-MywDwC-HlqMK-MJhksLrPdU,20712
+rolling_pin/command.py,sha256=xaM3Zp516sS2iF8RWb6qwGpc_IYmIkwtzJ2vDK9zPZo,6477
+rolling_pin/conform_config.py,sha256=W-Ps6FPuZ7SOxFOfEjIo2MZac1vCRuVky6samSZPQkw,2630
+rolling_pin/conform_etl.py,sha256=VyHAKVvdOtjx6Fy8dWn6XMfNh9OFgBbidyDUnSl3Zl4,9594
+rolling_pin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rolling_pin/radon_etl.py,sha256=0rxFSnv2z41vKFe35XqCHSnnjT9qNNjouaCcIYkcHgI,18252
+rolling_pin/repo_etl.py,sha256=Q6W-_4hTNh3nj5o9eTz5d7HuH5Kf9Uew8W9UD52dCJ0,21041
+rolling_pin/toml_etl.py,sha256=fyioQTfqFW1e15qZ8F64sX379V5JzNlBKBuC5IPIgIo,4350
+rolling_pin/tools.py,sha256=bLZGXDg5DuV59RxiVjLIwTAr83X5nMBElvR7w0mEnx8,19179
+rolling_pin-0.10.1.dist-info/entry_points.txt,sha256=nbMiJnGLhp49xrtx1pjK8sJiBrwkpj2kq-ezp8Zfyyk,56
+rolling_pin-0.10.1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+rolling_pin-0.10.1.dist-info/METADATA,sha256=B7s0WHFa3vdPUKujCpbyGuA45FAmlphifDzmRDonhSM,20054
+rolling_pin-0.10.1.dist-info/licenses/LICENSE,sha256=Z61vsRc9ZyRu0Tm3TkYgIeKDjUJCR3dT0hJonw9Q3i4,1067
+rolling_pin-0.10.1.dist-info/RECORD,,

rolling_pin-0.9.6.dist-info/RECORD DELETED Viewed

@@ -1,15 +0,0 @@
-rolling_pin/__init__.py,sha256=R_g0FYses--dTmvbZLtFFI-FPn4og6p8zmkEesYmN1A,511
-rolling_pin/blob_etl.py,sha256=79eEeCZwPeJ8XwMlLp9-MywDwC-HlqMK-MJhksLrPdU,20712
-rolling_pin/command.py,sha256=xaM3Zp516sS2iF8RWb6qwGpc_IYmIkwtzJ2vDK9zPZo,6477
-rolling_pin/conform_config.py,sha256=W-Ps6FPuZ7SOxFOfEjIo2MZac1vCRuVky6samSZPQkw,2630
-rolling_pin/conform_etl.py,sha256=VyHAKVvdOtjx6Fy8dWn6XMfNh9OFgBbidyDUnSl3Zl4,9594
-rolling_pin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rolling_pin/radon_etl.py,sha256=SbGrRQM-exMBXiVmCL1ZThvxwLbZNL6URK6J97Ffdis,17681
-rolling_pin/repo_etl.py,sha256=W3ms6zdK22A6d9kVzHLP3HE1h0fTPMUeXww0c57Nq-k,20479
-rolling_pin/toml_etl.py,sha256=fyioQTfqFW1e15qZ8F64sX379V5JzNlBKBuC5IPIgIo,4350
-rolling_pin/tools.py,sha256=Mt0BsOIhF-CC9mo-6JtNLPYjzJPdk3xgeAing0tZnQc,17498
-rolling_pin-0.9.6.dist-info/entry_points.txt,sha256=nbMiJnGLhp49xrtx1pjK8sJiBrwkpj2kq-ezp8Zfyyk,56
-rolling_pin-0.9.6.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-rolling_pin-0.9.6.dist-info/METADATA,sha256=0gCe3nfOtEw1Q7LOUI_2ORBfxMZm6LQiMcgcP2YkMDE,20057
-rolling_pin-0.9.6.dist-info/licenses/LICENSE,sha256=Z61vsRc9ZyRu0Tm3TkYgIeKDjUJCR3dT0hJonw9Q3i4,1067
-rolling_pin-0.9.6.dist-info/RECORD,,

{rolling_pin-0.9.6.dist-info → rolling_pin-0.10.1.dist-info}/WHEEL RENAMED Viewed

File without changes

{rolling_pin-0.9.6.dist-info → rolling_pin-0.10.1.dist-info}/entry_points.txt RENAMED Viewed

File without changes

{rolling_pin-0.9.6.dist-info → rolling_pin-0.10.1.dist-info}/licenses/LICENSE RENAMED Viewed

File without changes

rolling-pin 0.9.6__py3-none-any.whl → 0.10.1__py3-none-any.whl

rolling-pin 0.9.6py3-none-any.whl → 0.10.1py3-none-any.whl