datastock 0.0.30__tar.gz → 0.0.32__tar.gz

{datastock-0.0.30/datastock.egg-info → datastock-0.0.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datastock
-Version: 0.0.30
+Version: 0.0.32
 Summary: A python library for generic class and data handling
 Home-page: https://github.com/ToFuProject/datastock
 Author: Didier VEZINET
@@ -17,8 +17,18 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Natural Language :: English
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: matplotlib
+Requires-Dist: astropy
+Provides-Extra: dev
+Requires-Dist: check-manifest; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx-gallery; extra == "dev"
+Requires-Dist: sphinx_bootstrap_theme; extra == "dev"
 
 [![Conda]( https://anaconda.org/conda-forge/datastock/badges/version.svg)](https://anaconda.org/conda-forge/datastock)
 [![](https://anaconda.org/conda-forge/datastock/badges/downloads.svg)](https://anaconda.org/conda-forge/datastock)

{datastock-0.0.30 → datastock-0.0.32}/datastock/_class1_check.py

@@ -590,14 +590,14 @@ def _check_dref(
             isinstance(v0, dict)
             and (
                 isinstance(v0.get('data'), (np.ndarray, list, tuple))
-                or isinstance(v0.get('size'), (int, np.int_))
+                or isinstance(v0.get('size'), (int, np.integer))
             )
         )
         if not c0:
             msg = "v0 must be a dict with either 'data' or 'size'"
             raise Exception(msg)
 
-        if isinstance(v0.get('size'), (int, np.int_)):
+        if isinstance(v0.get('size'), (int, np.integer)):
             dref[k0]['size'] = int(v0['size'])
 
         dref2[key] = dict(dref[k0])
@@ -1553,9 +1553,9 @@ def _set_param(
     # Set value
 
     # Check value - TBC: allow list
-    ltypes = [str, int, np.integer, float, np.floating, tuple]
+    ltypes = (int, np.integer, float, str, tuple)
     lc = [
-        isinstance(value, tuple(ltypes)),
+        isinstance(value, ltypes),
         isinstance(value, (list, tuple, np.ndarray))
         and distribute is False,
         isinstance(value, (list, tuple, np.ndarray))
@@ -1569,15 +1569,15 @@ def _set_param(
     ]
     if not (value is None or any(lc)):
         msg = (
-            """
+            f"""
             Accepted types for value include:
                 - None
-                - {}: common to all
+                - {ltypes}: common to all
                 - list, np.ndarray: key by key
                 - dict of scalar / str
 
-            The length of value must match the selected keys ({})
-            """.format(ltypes, len(key))
+            The length of value must match the selected keys ({len(key)})
+            """
         )
         raise Exception(msg)
 
@@ -1690,7 +1690,7 @@ def _ind_tofrom_key(
             and (
                 (ind.dtype == np.bool and ind.size == len(dd))
                 or (
-                    ind.dtype == np.int
+                    ind.dtype == int
                     and np.all(np.isfinite(ind))
                     and np.max(ind) <= len(dd)
                 )
@@ -1798,10 +1798,11 @@ def _select(dd=None, dd_name=None, log=None, returnas=None, **kwdargs):
     # Get raw bool indices
 
     # Get list of accessible param
-    ltypes = (int, np.int_, float, np.float_)
+    ltypes = (float, int, np.integer)
     lquant = [
         kk for kk in kwdargs.keys()
-        if any([isinstance(dd[k0][kk], ltypes) for k0 in dd.keys()])
+        if any([isinstance(dd[k0][kk], ltypes) for k0 in dd.keys()
+        ])
     ]
 
     # Prepare array of bool indices and populate
@@ -1973,7 +1974,7 @@ def _show_extract(dobj=None, lk=None):
         if isinstance(v0, float):
             lv0.append(f'{v0:.2e}')
         elif isinstance(v0, np.ndarray) and v0.size == 3:
-            if v0.dtype == np.float:
+            if v0.dtype == float:
                 lv0.append(
                     np.array2string(
                         v0,

{datastock-0.0.30 → datastock-0.0.32}/datastock/_class3.py

@@ -38,6 +38,7 @@ class DataStock3(DataStock2):
         inverty=None,
         bck=None,
         interp=None,
+        show_commands=None,
         # figure-specific
         dax=None,
         dmargin=None,
@@ -72,6 +73,7 @@ class DataStock3(DataStock2):
             inverty=inverty,
             bck=bck,
             interp=interp,
+            show_commands=show_commands,
             # figure-specific
             dax=dax,
             dmargin=dmargin,
@@ -102,6 +104,7 @@ class DataStock3(DataStock2):
         rotation=None,
         inverty=None,
         bck=None,
+        show_commands=None,
         # figure-specific
         dax=None,
         dmargin=None,
@@ -131,6 +134,7 @@ class DataStock3(DataStock2):
             rotation=rotation,
             inverty=inverty,
             bck=bck,
+            show_commands=show_commands,
             # figure-specific
             dax=dax,
             dmargin=dmargin,
@@ -158,6 +162,7 @@ class DataStock3(DataStock2):
         lkeys=None,
         bstr_dict=None,
         rotation=None,
+        show_commands=None,
         # figure-specific
         dax=None,
         dmargin=None,
@@ -185,6 +190,7 @@ class DataStock3(DataStock2):
             lkeys=lkeys,
             bstr_dict=bstr_dict,
             rotation=rotation,
+            show_commands=show_commands,
             # figure-specific
             dax=dax,
             dmargin=dmargin,
@@ -247,6 +253,7 @@ class DataStock3(DataStock2):
         keyB=None,
         keyX=None,
         axis=None,
+        show_commands=None,
         # customization of scatter plot
         dlim=None,
         color_dict=None,
@@ -289,6 +296,7 @@ class DataStock3(DataStock2):
             keyB=keyB,
             keyX=keyX,
             axis=axis,
+            show_commands=show_commands,
             # customization of scatter plot
             dlim=dlim,
             color_dict=color_dict,

{datastock-0.0.30 → datastock-0.0.32}/datastock/_plot_BvsA_as_distribution.py

@@ -37,6 +37,7 @@ def plot_BvsA_as_distribution(
     keyB=None,
     keyX=None,
     axis=None,
+    show_commands=None,
     # customization of scatter plot
     dlim=None,
     dlim_logic=None,
@@ -471,7 +472,7 @@ def plot_BvsA_as_distribution(
         coll2.disconnect_old()
         coll2.connect()
 
-        coll2.show_commands()
+        coll2.show_commands(verb=show_commands)
         return coll2
     else:
         return coll2, dgroup

{datastock-0.0.30 → datastock-0.0.32}/datastock/_plot_as_array.py

@@ -65,6 +65,7 @@ def plot_as_array(
     inverty=None,
     bck=None,
     interp=None,
+    show_commands=None,
     # figure-specific
     dax=None,
     dmargin=None,
@@ -324,7 +325,7 @@ def plot_as_array(
         coll2.disconnect_old()
         coll2.connect()
 
-        coll2.show_commands()
+        coll2.show_commands(verb=show_commands)
         return coll2
     else:
         return coll2, dgroup
@@ -412,10 +413,18 @@ def _check_keyXYZ(
                         or _check_uniform_log(k0=k0, ddata=coll._ddata)
                     ]
 
-                keyX = _generic_check._check_var(
-                    keyX, 'keyX',
-                    allowed=lok,
-                )
+                try:
+                    keyX = _generic_check._check_var(
+                        keyX, keyXstr,
+                        allowed=lok,
+                    )
+                except Exception as err:
+                    msg = (
+                        err.args[0]
+                        + f"\nContraint on uniformity: {uniform}"
+                    )
+                    err.args = (msg,)
+                    raise err
 
                 refX = coll._ddata[keyX]['ref'][0]
 
@@ -425,6 +434,22 @@ def _check_keyXYZ(
             elif keyX in refs:
                 keyX, refX = 'index', keyX
 
+            elif keyX == 'index':
+                if already is None:
+                    refX = refs[dim_min - 1]
+                elif all([kk in already for kk in refs]): # TBC
+                    # sameref
+                    refX = refs[dim_min - 1]
+                    msg = (
+                        "Special case\n"
+                        "\t- refs: {refs}\n"
+                        f"\t- '{keyXstr}': {keyX}\n"
+                        f"\t- already: {already}"
+                    )
+                    raise Exception(msg)
+                else:
+                    refX = [kk for kk in refs if kk not in already][0]
+
             else:
                 msg = (
                     f"Arg '{keyXstr}' refers to unknow data:\n"
@@ -1132,8 +1157,13 @@ def plot_as_array_2d(
         ax2.set_ylabel('data')
         ax2.set_xlabel(labX)
 
-        ax1.set_xlim(ymin, ymax)
-        ax2.set_ylim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax1.set_xlim(left=ymin)
+            ax2.set_ylim(bottom=ymin)
+        if np.isfinite(ymax):
+            ax1.set_xlim(right=ymax)
+            ax2.set_ylim(top=ymax)
+
 
         # axes for text
         ax3 = fig.add_subplot(gs[:3, 3], frameon=False)
@@ -2065,7 +2095,10 @@ def _plot_as_array_3d_label_axes(
         ax.yaxis.set_label_position('right')
         ax.xaxis.set_label_position('top')
 
-        ax.set_xlim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax.set_xlim(left=ymin)
+        if np.isfinite(ymax):
+            ax.set_xlim(right=ymax)
 
         # y text ticks
         if ystr:
@@ -2090,7 +2123,10 @@ def _plot_as_array_3d_label_axes(
         ax.set_ylabel('data')
         ax.set_xlabel(labX)
 
-        ax.set_ylim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax.set_ylim(bottom=ymin)
+        if np.isfinite(ymax):
+            ax.set_ylim(top=ymax)
 
         # x text ticks
         if xstr:
@@ -2113,7 +2149,10 @@ def _plot_as_array_3d_label_axes(
         ax.set_ylabel('data')
         ax.set_xlabel(labZ)
 
-        ax.set_ylim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax.set_ylim(bottom=ymin)
+        if np.isfinite(ymax):
+            ax.set_ylim(top=ymax)
 
         # z text ticks
         if zstr:
@@ -2901,7 +2940,10 @@ def _plot_as_array_4d_label_axes(
         ax.yaxis.set_label_position('right')
         ax.xaxis.set_label_position('top')
 
-        ax.set_xlim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax.set_xlim(left=ymin)
+        if np.isfinite(ymax):
+            ax.set_xlim(right=ymax)
 
         # y text ticks
         if ystr:

{datastock-0.0.30 → datastock-0.0.32}/datastock/_plot_as_mobile_lines.py

@@ -58,6 +58,7 @@ def plot_as_mobile_lines(
     lkeys=None,
     bstr_dict=None,
     rotation=None,
+    show_commands=None,
     # figure-specific
     dax=None,
     dmargin=None,
@@ -184,7 +185,7 @@ def plot_as_mobile_lines(
         coll2.disconnect_old()
         coll2.connect()
 
-        coll2.show_commands()
+        coll2.show_commands(verb=show_commands)
         return coll2
     else:
         return coll2, dgroup

{datastock-0.0.30 → datastock-0.0.32}/datastock/_plot_as_profile1d.py

@@ -62,6 +62,7 @@ def plot_as_profile1d(
     rotation=None,
     inverty=None,
     bck=None,
+    show_commands=None,
     # figure-specific
     dax=None,
     dmargin=None,
@@ -173,7 +174,7 @@ def plot_as_profile1d(
         coll2.disconnect_old()
         coll2.connect()
 
-        coll2.show_commands()
+        coll2.show_commands(verb=show_commands)
         return coll2
     else:
         return coll2, dgroup

{datastock-0.0.30 → datastock-0.0.32}/datastock/version.py

@@ -1,2 +1,2 @@
 # Do not edit, pipeline versioning governed by git tags!
-__version__ = '0.0.30'
+__version__ = '0.0.32'

{datastock-0.0.30 → datastock-0.0.32/datastock.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datastock
-Version: 0.0.30
+Version: 0.0.32
 Summary: A python library for generic class and data handling
 Home-page: https://github.com/ToFuProject/datastock
 Author: Didier VEZINET
@@ -17,8 +17,18 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Natural Language :: English
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: matplotlib
+Requires-Dist: astropy
+Provides-Extra: dev
+Requires-Dist: check-manifest; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx-gallery; extra == "dev"
+Requires-Dist: sphinx_bootstrap_theme; extra == "dev"
 
 [![Conda]( https://anaconda.org/conda-forge/datastock/badges/version.svg)](https://anaconda.org/conda-forge/datastock)
 [![](https://anaconda.org/conda-forge/datastock/badges/downloads.svg)](https://anaconda.org/conda-forge/datastock)