datastock 0.0.41__tar.gz → 0.0.42__tar.gz

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 (49) hide show
  1. {datastock-0.0.41/datastock.egg-info → datastock-0.0.42}/PKG-INFO +1 -1
  2. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class0.py +1 -1
  3. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class1_check.py +9 -2
  4. {datastock-0.0.41 → datastock-0.0.42}/datastock/version.py +1 -1
  5. {datastock-0.0.41 → datastock-0.0.42/datastock.egg-info}/PKG-INFO +1 -1
  6. {datastock-0.0.41 → datastock-0.0.42}/LICENSE +0 -0
  7. {datastock-0.0.41 → datastock-0.0.42}/MANIFEST.in +0 -0
  8. {datastock-0.0.41 → datastock-0.0.42}/README.md +0 -0
  9. {datastock-0.0.41 → datastock-0.0.42}/_updateversion.py +0 -0
  10. {datastock-0.0.41 → datastock-0.0.42}/datastock/_DataCollection_utils.py +0 -0
  11. {datastock-0.0.41 → datastock-0.0.42}/datastock/__init__.py +0 -0
  12. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class.py +0 -0
  13. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class1.py +0 -0
  14. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class1_binning.py +0 -0
  15. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class1_compute.py +0 -0
  16. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class1_domain.py +0 -0
  17. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class1_interpolate.py +0 -0
  18. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class1_show.py +0 -0
  19. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class1_uniformize.py +0 -0
  20. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class2.py +0 -0
  21. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class2_interactivity.py +0 -0
  22. {datastock-0.0.41 → datastock-0.0.42}/datastock/_class3.py +0 -0
  23. {datastock-0.0.41 → datastock-0.0.42}/datastock/_direct_calls.py +0 -0
  24. {datastock-0.0.41 → datastock-0.0.42}/datastock/_export_dataframe.py +0 -0
  25. {datastock-0.0.41 → datastock-0.0.42}/datastock/_find_plateau.py +0 -0
  26. {datastock-0.0.41 → datastock-0.0.42}/datastock/_generic_check.py +0 -0
  27. {datastock-0.0.41 → datastock-0.0.42}/datastock/_generic_utils.py +0 -0
  28. {datastock-0.0.41 → datastock-0.0.42}/datastock/_generic_utils_plot.py +0 -0
  29. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_BvsA_as_distribution.py +0 -0
  30. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_BvsA_as_distribution_check.py +0 -0
  31. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_as_array.py +0 -0
  32. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_as_array_1d.py +0 -0
  33. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_as_array_234d.py +0 -0
  34. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_as_mobile_lines.py +0 -0
  35. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_as_profile1d.py +0 -0
  36. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_correlations.py +0 -0
  37. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_old_backup.py +0 -0
  38. {datastock-0.0.41 → datastock-0.0.42}/datastock/_plot_text.py +0 -0
  39. {datastock-0.0.41 → datastock-0.0.42}/datastock/_saveload.py +0 -0
  40. {datastock-0.0.41 → datastock-0.0.42}/datastock/tests/__init__.py +0 -0
  41. {datastock-0.0.41 → datastock-0.0.42}/datastock/tests/output/__init__.py +0 -0
  42. {datastock-0.0.41 → datastock-0.0.42}/datastock/tests/test_01_DataStock.py +0 -0
  43. {datastock-0.0.41 → datastock-0.0.42}/datastock.egg-info/SOURCES.txt +0 -0
  44. {datastock-0.0.41 → datastock-0.0.42}/datastock.egg-info/dependency_links.txt +0 -0
  45. {datastock-0.0.41 → datastock-0.0.42}/datastock.egg-info/requires.txt +0 -0
  46. {datastock-0.0.41 → datastock-0.0.42}/datastock.egg-info/top_level.txt +0 -0
  47. {datastock-0.0.41 → datastock-0.0.42}/pyproject.toml +0 -0
  48. {datastock-0.0.41 → datastock-0.0.42}/setup.cfg +0 -0
  49. {datastock-0.0.41 → datastock-0.0.42}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: datastock
3
- Version: 0.0.41
3
+ Version: 0.0.42
4
4
  Summary: A python library for generic class and data handling
5
5
  Home-page: https://github.com/ToFuProject/datastock
6
6
  Author: Didier VEZINET
@@ -168,7 +168,7 @@ class DataStock0(object):
168
168
  return_pfe=False,
169
169
  ):
170
170
 
171
- lsep = ['.', '-', '_', ',', ';', '~', '?']
171
+ lsep = [';', '&', '?', '#', ',', '~', '.', '-', '_']
172
172
  if sep is None:
173
173
  for ss in lsep:
174
174
  c0 = (
@@ -147,7 +147,14 @@ def _check_conflicts(dd=None, dd0=None, dd_name=None, returnas=None):
147
147
  or (
148
148
  not isinstance(v0[kk], np.ndarray)
149
149
  and not scpsp.issparse(v0[kk])
150
- and v0[kk] == dd0[k0][kk]
150
+ and (
151
+ v0[kk] == dd0[k0][kk]
152
+ or (
153
+ # asunit.Unit vs str should be the same
154
+ kk == 'units'
155
+ and str(v0[kk]) == str(dd0[k0][kk])
156
+ )
157
+ )
151
158
  )
152
159
  )
153
160
  )
@@ -1925,4 +1932,4 @@ def _select(dd=None, dd_name=None, log=None, returnas=None, **kwdargs):
1925
1932
  [k0 for jj, k0 in enumerate(dd.keys()) if ind[jj]],
1926
1933
  dtype=str,
1927
1934
  )
1928
- return ind
1935
+ return ind
@@ -1,2 +1,2 @@
1
1
  # Do not edit, pipeline versioning governed by git tags!
2
- __version__ = '0.0.41'
2
+ __version__ = '0.0.42'
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: datastock
3
- Version: 0.0.41
3
+ Version: 0.0.42
4
4
  Summary: A python library for generic class and data handling
5
5
  Home-page: https://github.com/ToFuProject/datastock
6
6
  Author: Didier VEZINET
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes