datastock 0.0.41__py3-none-any.whl → 0.0.42__py3-none-any.whl

datastock/_class0.py

@@ -168,7 +168,7 @@ class DataStock0(object):
         return_pfe=False,
     ):
 
-        lsep = ['.', '-', '_', ',', ';', '~', '?']
+        lsep = [';', '&', '?', '#', ',', '~', '.', '-', '_']
         if sep is None:
             for ss in lsep:
                 c0 = (

datastock/_class1_check.py

@@ -147,7 +147,14 @@ def _check_conflicts(dd=None, dd0=None, dd_name=None, returnas=None):
                     or (
                         not isinstance(v0[kk], np.ndarray)
                         and not scpsp.issparse(v0[kk])
-                        and v0[kk] == dd0[k0][kk]
+                        and (
+                            v0[kk] == dd0[k0][kk]
+                            or (
+                                # asunit.Unit vs str should be the same
+                                kk == 'units'
+                                and str(v0[kk]) == str(dd0[k0][kk])
+                            )
+                        )
                     )
                 )
             )
@@ -1925,4 +1932,4 @@ def _select(dd=None, dd_name=None, log=None, returnas=None, **kwdargs):
                 [k0 for jj, k0 in enumerate(dd.keys()) if ind[jj]],
                 dtype=str,
             )
-    return ind
+    return ind

datastock/version.py

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

{datastock-0.0.41.dist-info → datastock-0.0.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datastock
-Version: 0.0.41
+Version: 0.0.42
 Summary: A python library for generic class and data handling
 Home-page: https://github.com/ToFuProject/datastock
 Author: Didier VEZINET

{datastock-0.0.41.dist-info → datastock-0.0.42.dist-info}/RECORD

@@ -2,10 +2,10 @@ _updateversion.py,sha256=OR6OJJozaHWzu7NWjKu5ERi0IyYqR61KrWvzf7kfoto,951
 datastock/_DataCollection_utils.py,sha256=hHf6HvGKMmM-psx3fj9QcY1TEmKrAtTdkRokH7SFqoo,7143
 datastock/__init__.py,sha256=i_Ijl-AM07n4zN52frWfbeGN1iB6v4e5oLzTuVIh_oM,217
 datastock/_class.py,sha256=Az9PS3aSskiPMb1ekt78Y2ynBujYVc_cDjJxW9xH9g4,47
-datastock/_class0.py,sha256=QULjNJke13jJrGLIeM7SWHZVziorDK_KCIlqq8LgS9U,5883
+datastock/_class0.py,sha256=2mju4Larmj1Sv5ZMuqPTLvCY-BajhGD3qG6QBalTnRY,5893
 datastock/_class1.py,sha256=8R4zM6p7b62FJuoI7Gyik4_tRCUFi6aF4oaMimiOoFE,28726
 datastock/_class1_binning.py,sha256=LWHv2LIfgZfSFWYwqdcN0DKpNe6q7Go3sxfcJqmzTrI,28085
-datastock/_class1_check.py,sha256=0PikkAZjlU0L59i8iue3ihK1t_uN-9oGh9Xe060QvWo,50672
+datastock/_class1_check.py,sha256=0azV7ftoAWsqTMEYbGQ_luJi95Px-pBif_vOug3W8Zg,50978
 datastock/_class1_compute.py,sha256=yHdG0afYc_YtjpR6RvMh7SeRtWEyuHZ5y9VOPRIYVDo,31671
 datastock/_class1_domain.py,sha256=bkuCl29QO7C3RchC8qZyreU90QxmdDYNVYDmzuCLCUY,6252
 datastock/_class1_interpolate.py,sha256=3LRKK6aOepJLSnRoRpsS8RAnobqTdE-QZrkdQrnIaqc,37825
@@ -31,12 +31,12 @@ datastock/_plot_correlations.py,sha256=ITOypu_AEoKl0ihxocV-JVTXIHqut6p9TfG-xZmQy
 datastock/_plot_old_backup.py,sha256=XixTi2CiihKjtQP0TRycH0b25caWN1m35DgpsDeiWZE,21729
 datastock/_plot_text.py,sha256=wQPqjfpLyIioS2JeOt3E9C9HgYUJ49YEoOgRuKYvAR8,3143
 datastock/_saveload.py,sha256=NdOykvmeCaPhpk0EF5WQezYzpuZM2Ul101Nqc4I3dnY,11729
-datastock/version.py,sha256=HlwZwixL3E8KCwqVjPmGBvXawDbglt-PvliSac_-yb4,80
+datastock/version.py,sha256=eImSu2FfqgzmD49HEFW5QfRn9NBAw_itX40-C-Zj7V0,80
 datastock/tests/__init__.py,sha256=teOo2xP0IO7PQMuMDmum61XVHe2TuxW3BiHiL73X8jQ,35
 datastock/tests/test_01_DataStock.py,sha256=QJSmrVXD6wX-plfrFdLyZou20IYZGAKzartSi84BfC0,16982
 datastock/tests/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datastock-0.0.41.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
-datastock-0.0.41.dist-info/METADATA,sha256=QSbiL_qWjMq7TQ6DIQvaOJkHAGi_lwu3-Gx9RrxLB-o,8660
-datastock-0.0.41.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-datastock-0.0.41.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
-datastock-0.0.41.dist-info/RECORD,,
+datastock-0.0.42.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
+datastock-0.0.42.dist-info/METADATA,sha256=VaEXXEm0YfQQmm_ccn37rA13jkzppnLnTJdfc0oi6qQ,8660
+datastock-0.0.42.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+datastock-0.0.42.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
+datastock-0.0.42.dist-info/RECORD,,

{datastock-0.0.41.dist-info → datastock-0.0.42.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any