jupyter-analysis-tools 1.6.0__tar.gz → 1.6.1__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 (55) hide show
  1. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/.copier-answers.yml +1 -1
  2. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/CHANGELOG.md +10 -0
  3. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/PKG-INFO +13 -3
  4. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/README.md +2 -2
  5. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/conf.py +1 -1
  6. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/__init__.py +1 -1
  7. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/datastore.py +14 -10
  8. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools.egg-info/PKG-INFO +13 -3
  9. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/.editorconfig +0 -0
  10. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/.pre-commit-config.yaml +0 -0
  11. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/AUTHORS.rst +0 -0
  12. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/CONTRIBUTING.rst +0 -0
  13. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/LICENSE +0 -0
  14. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/MANIFEST.in +0 -0
  15. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/ci/requirements.txt +0 -0
  16. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/_templates/class.rst +0 -0
  17. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/_templates/module.rst +0 -0
  18. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/authors.rst +0 -0
  19. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/changelog.rst +0 -0
  20. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/contributing.rst +0 -0
  21. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/index.rst +0 -0
  22. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/installation.rst +0 -0
  23. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/readme.rst +0 -0
  24. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/reference/index.rst +0 -0
  25. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/requirements.txt +0 -0
  26. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/spelling_wordlist.txt +0 -0
  27. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/usage.rst +0 -0
  28. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/pyproject.toml +0 -0
  29. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/setup.cfg +0 -0
  30. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/analysis.py +0 -0
  31. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/binning.py +0 -0
  32. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/datalocations.py +0 -0
  33. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/distrib.py +0 -0
  34. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/git.py +0 -0
  35. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/plotting.py +0 -0
  36. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/readdata.py +0 -0
  37. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/ssfz2json.py +0 -0
  38. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/ssfz_compare.py +0 -0
  39. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/utils.py +0 -0
  40. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/widgets.py +0 -0
  41. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools.egg-info/SOURCES.txt +0 -0
  42. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools.egg-info/dependency_links.txt +0 -0
  43. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools.egg-info/entry_points.txt +0 -0
  44. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools.egg-info/requires.txt +0 -0
  45. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools.egg-info/top_level.txt +0 -0
  46. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/templates/CHANGELOG.md.j2 +0 -0
  47. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/testdata/2015-03-20-Silica.ssf.json +0 -0
  48. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/testdata/2015-03-20-Silica.ssfz +0 -0
  49. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/testdata/S2842 water.json +0 -0
  50. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/testdata/S2842 water.pdh +0 -0
  51. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/testdata/S2843[9].pdh +0 -0
  52. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/tests/readdata.py +0 -0
  53. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/tests/requirements.txt +0 -0
  54. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/tests/utils.py +0 -0
  55. {jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/tox.ini +0 -0
{jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/.copier-answers.yml RENAMED
@@ -22,4 +22,4 @@ repo_main_branch: main
22
22
  repo_name: jupyter-analysis-tools
23
23
  repo_userorg: BAMresearch
24
24
  sphinx_theme: furo
25
- version: 1.6.0
25
+ version: 1.6.1
{jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/CHANGELOG.md RENAMED
@@ -1,5 +1,15 @@
1
1
  # CHANGELOG
2
2
 
3
+ ## v1.6.1 (2025-09-19)
4
+
5
+ ### Bug fixes
6
+
7
+ * **DataStore**: regression of handling of existing objects ([`28bd44c`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/28bd44cf019aea0203ad252fd434860f45a1e54a))
8
+
9
+ * **DataStore**: proper forwarding of spacePrefix for filtering relevant spaces ([`c4117f3`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/c4117f3b04b9f6237f6d8471bef2d76c379e6f11))
10
+
11
+ * **DataStore**: use the URL provided by constructor ([`fcc46fb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/fcc46fb941006b489054dc492f433e62d77cb605))
12
+
3
13
  ## v1.6.0 (2025-09-19)
4
14
 
5
15
  ### Bug fixes
{jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: jupyter-analysis-tools
3
- Version: 1.6.0
3
+ Version: 1.6.1
4
4
  Summary: Yet another Python library with helpers and utilities for data analysis and processing.
5
5
  Author-email: Ingo Breßler <ingo.bressler@bam.de>, "Brian R. Pauw" <brian.pauw@bam.de>
6
6
  License-Expression: MIT
@@ -35,10 +35,10 @@ Requires-Dist: matplotlib
35
35
  Requires-Dist: ipywidgets
36
36
  Dynamic: license-file
37
37
 
38
- # Jupyter Analysis Tools (v1.6.0)
38
+ # Jupyter Analysis Tools (v1.6.1)
39
39
 
40
40
  [![PyPI Package latest release](https://img.shields.io/pypi/v/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
41
- [![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.6.0.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.0...main)
41
+ [![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.6.1.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.1...main)
42
42
  [![License](https://img.shields.io/pypi/l/jupyter-analysis-tools.svg)](https://en.wikipedia.org/wiki/MIT_license)
43
43
  [![Supported versions](https://img.shields.io/pypi/pyversions/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
44
44
  [![PyPI Wheel](https://img.shields.io/pypi/wheel/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools#files)
@@ -97,6 +97,16 @@ are installed:
97
97
 
98
98
  # CHANGELOG
99
99
 
100
+ ## v1.6.1 (2025-09-19)
101
+
102
+ ### Bug fixes
103
+
104
+ * **DataStore**: regression of handling of existing objects ([`28bd44c`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/28bd44cf019aea0203ad252fd434860f45a1e54a))
105
+
106
+ * **DataStore**: proper forwarding of spacePrefix for filtering relevant spaces ([`c4117f3`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/c4117f3b04b9f6237f6d8471bef2d76c379e6f11))
107
+
108
+ * **DataStore**: use the URL provided by constructor ([`fcc46fb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/fcc46fb941006b489054dc492f433e62d77cb605))
109
+
100
110
  ## v1.6.0 (2025-09-19)
101
111
 
102
112
  ### Bug fixes
{jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/README.md RENAMED
@@ -1,7 +1,7 @@
1
- # Jupyter Analysis Tools (v1.6.0)
1
+ # Jupyter Analysis Tools (v1.6.1)
2
2
 
3
3
  [![PyPI Package latest release](https://img.shields.io/pypi/v/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
4
- [![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.6.0.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.0...main)
4
+ [![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.6.1.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.1...main)
5
5
  [![License](https://img.shields.io/pypi/l/jupyter-analysis-tools.svg)](https://en.wikipedia.org/wiki/MIT_license)
6
6
  [![Supported versions](https://img.shields.io/pypi/pyversions/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
7
7
  [![PyPI Wheel](https://img.shields.io/pypi/wheel/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools#files)
{jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/docs/conf.py RENAMED
@@ -32,7 +32,7 @@ project = "Jupyter Analysis Tools"
32
32
  year = "2018-2025"
33
33
  author = "Ingo Breßler and Brian R. Pauw"
34
34
  copyright = "{0}, {1}".format(year, author)
35
- version = "1.6.0"
35
+ version = "1.6.1"
36
36
  release = version
37
37
  commit_id = None
38
38
  try:
{jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/__init__.py RENAMED
@@ -1,7 +1,7 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  # __init__.py
3
3
 
4
- __version__ = "1.6.0"
4
+ __version__ = "1.6.1"
5
5
 
6
6
  from .binning import reBin
7
7
  from .git import checkRepo, isNBstripoutActivated, isNBstripoutInstalled, isRepo
{jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools/datastore.py RENAMED
@@ -16,6 +16,7 @@ class DataStore:
16
16
  _userspace = None
17
17
 
18
18
  def __init__(self, url, username=None):
19
+ self.url = url
19
20
  self.username = username
20
21
  if self.username is None:
21
22
  self.username = getpass.getuser()
@@ -52,13 +53,15 @@ class DataStore:
52
53
  def identifier(objects, code):
53
54
  return objects[objects.code == code].identifier.tolist()[0]
54
55
 
55
- def createProject(self, projectName, space, space_prefix=None):
56
- """Finds the requested project in the DataStore. If it does not exist,
57
- creates a new project with the given code in the given space."""
56
+ def createProject(self, projectName, space, spacePrefix=None):
57
+ """Finds the requested project in the DataStore.
58
+ Matching project names can be limited to a given *spacePrefix*.
59
+ If the project is not found, a new project with the given code in the given space
60
+ is created."""
58
61
  # get available projects, accessible by the current user
59
62
  projectsAvail = self.ds.get_projects()
60
- if space_prefix:
61
- projectsAvail = [prj for prj in projectsAvail if f"/{space_prefix}_" in prj.identifier]
63
+ if spacePrefix:
64
+ projectsAvail = [prj for prj in projectsAvail if f"/{spacePrefix}_" in prj.identifier]
62
65
  projects = [prj for prj in projectsAvail if prj.code == projectName]
63
66
  assert len(projects) <= 1, f"Multiple projects found for '{projectName}'"
64
67
  dsProject = None
@@ -108,23 +111,24 @@ class DataStore:
108
111
 
109
112
  def createObject(
110
113
  self,
111
- projectName,
114
+ projectName: str,
112
115
  collectionName: str = None,
113
- space=None,
116
+ space: str = None,
117
+ spacePrefix: str = None,
114
118
  objType: str = None,
115
119
  props: dict = None,
116
120
  ):
117
- dsProject = self.createProject(projectName, space)
121
+ dsProject = self.createProject(projectName, space, spacePrefix=spacePrefix)
118
122
  dsColl = None
119
123
  if collectionName is None: # collectionName is required
120
124
  return None
121
125
  dsColl = self.createCollection(collectionName, dsProject, defaultObjType=objType)
122
- obj = None
123
126
  obj = self.ds.get_objects(type=objType, where={"$name": props["$name"]}).objects
124
127
  if len(obj):
128
+ obj = obj[0]
125
129
  prefix = objType
126
130
  msg = "'{}' exists already in {}! Updating ...".format(
127
- obj[0].props["$name"], obj[0].project.identifier
131
+ obj.props["$name"], obj.project.identifier
128
132
  )
129
133
  warnings.warn_explicit(msg, UserWarning, prefix, 0)
130
134
  else: # does not exist yet
{jupyter_analysis_tools-1.6.0 → jupyter_analysis_tools-1.6.1}/src/jupyter_analysis_tools.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: jupyter-analysis-tools
3
- Version: 1.6.0
3
+ Version: 1.6.1
4
4
  Summary: Yet another Python library with helpers and utilities for data analysis and processing.
5
5
  Author-email: Ingo Breßler <ingo.bressler@bam.de>, "Brian R. Pauw" <brian.pauw@bam.de>
6
6
  License-Expression: MIT
@@ -35,10 +35,10 @@ Requires-Dist: matplotlib
35
35
  Requires-Dist: ipywidgets
36
36
  Dynamic: license-file
37
37
 
38
- # Jupyter Analysis Tools (v1.6.0)
38
+ # Jupyter Analysis Tools (v1.6.1)
39
39
 
40
40
  [![PyPI Package latest release](https://img.shields.io/pypi/v/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
41
- [![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.6.0.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.0...main)
41
+ [![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.6.1.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.1...main)
42
42
  [![License](https://img.shields.io/pypi/l/jupyter-analysis-tools.svg)](https://en.wikipedia.org/wiki/MIT_license)
43
43
  [![Supported versions](https://img.shields.io/pypi/pyversions/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
44
44
  [![PyPI Wheel](https://img.shields.io/pypi/wheel/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools#files)
@@ -97,6 +97,16 @@ are installed:
97
97
 
98
98
  # CHANGELOG
99
99
 
100
+ ## v1.6.1 (2025-09-19)
101
+
102
+ ### Bug fixes
103
+
104
+ * **DataStore**: regression of handling of existing objects ([`28bd44c`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/28bd44cf019aea0203ad252fd434860f45a1e54a))
105
+
106
+ * **DataStore**: proper forwarding of spacePrefix for filtering relevant spaces ([`c4117f3`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/c4117f3b04b9f6237f6d8471bef2d76c379e6f11))
107
+
108
+ * **DataStore**: use the URL provided by constructor ([`fcc46fb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/fcc46fb941006b489054dc492f433e62d77cb605))
109
+
100
110
  ## v1.6.0 (2025-09-19)
101
111
 
102
112
  ### Bug fixes