moreniius 0.2.2__tar.gz → 0.2.4__tar.gz

{moreniius-0.2.2 → moreniius-0.2.4}/.github/workflows/pip.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

{moreniius-0.2.2 → moreniius-0.2.4}/.github/workflows/wheels.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Check metadata
       run: pipx run twine check dist/*
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         path: dist/*
 
@@ -42,9 +42,9 @@ jobs:
     if: github.event_name == 'release' && github.event.action == 'published'
 
     steps:
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: artifact
         path: dist

{moreniius-0.2.2/src/moreniius.egg-info → moreniius-0.2.4}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.1
 Name: moreniius
-Version: 0.2.2
+Version: 0.2.4
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Development Status :: 2 - Pre-Alpha
 Description-Content-Type: text/markdown
-Requires-Dist: zenlog==1.1
-Requires-Dist: platformdirs==3.11
+Requires-Dist: zenlog>=1.1
+Requires-Dist: platformdirs>=3.11
 Requires-Dist: importlib_metadata; python_version < "3.8"
-Requires-Dist: mccode-antlr[hdf5]==0.7.0
-Requires-Dist: nexusformat==1.0.6
+Requires-Dist: mccode-antlr[hdf5]>=0.7.1
+Requires-Dist: nexusformat>=1.0.6
 
 # moreniius
 A project to contain custom components required to use `eniius` to produce `NeXus Structure` `JSON` from `mccode-antlr` simulated instruments.

{moreniius-0.2.2 → moreniius-0.2.4}/pyproject.toml

@@ -5,11 +5,11 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "moreniius"
 dependencies = [
-    'zenlog==1.1,',
-    'platformdirs==3.11',
+    'zenlog>=1.1',
+    'platformdirs>=3.11',
     "importlib_metadata; python_version<'3.8'",
-    'mccode-antlr[hdf5]==0.7.0',
-    'nexusformat==1.0.6'
+    'mccode-antlr[hdf5]>=0.7.1',
+    'nexusformat>=1.0.6'
 ]
 readme = "README.md"
 authors = [

{moreniius-0.2.2 → moreniius-0.2.4}/src/moreniius/mccode/instr.py

@@ -83,8 +83,24 @@ class NXInstr:
                 'expression' in nx_args[0]:
             not_expr = [x for x in nx_args[0] if x != 'expression']
             if len(not_expr) == 1:
+                not_expr_arg = nx_args[0][not_expr[0]]
+                if isinstance(not_expr_arg, NXfield):
+                    # We have and want an NXfield, but it might be missing attributes specified in the nx_kwargs
+                    # Passing the keywords to the NXfield constructor versus this method is not identical,
+                    # since some keyword arguments are reserved (and only some of which are noted)
+                    #   Explicit keywords, used in the constructor:
+                    #       value, name, shape, dtype, group, attrs
+                    #   Keywords extracted from the kwargs dict, if present (and all controlling HDF5 file attributes?):
+                    #       chunks, compression, compression_opts, fillvalue, fletcher32, maxshape, scaleoffset, shuffle
+                    # For now, just assume all keywords provided here are _actually_ attributes for the NXfield
+                    # which is an extension of a dict, but can *not* use the update method, since the __setitem__
+                    # method is overridden to wrap inputs in NXattr objects :/
+                    for k, v in nx_kwargs.items():
+                        not_expr_arg.attrs[k] = v
+                    return not_expr_arg
+
                 # TODO make this return an nx_class once we're sure that nx_kwargs is parseable (no mccode_antlr.Expr)
-                return nx_class(nx_args[0][not_expr[0]], **nx_kwargs)
+                return nx_class(not_expr_arg, **nx_kwargs)
             else:
                 raise RuntimeError('Not sure what I should do here')
         return nx_class(*nx_args, **nx_kwargs)

{moreniius-0.2.2 → moreniius-0.2.4}/src/moreniius/mccode/orientation.py

@@ -28,7 +28,6 @@ class NXPart:
         pos = self.o.position()
         if any(isinstance(c, (Expr, Value)) for c in (pos.x, pos.y, pos.z)):
             translations = []
-            print(f'{pos.x=} {pos.y=} {pos.z=}')
             for n, c, v in (('x', pos.x, [1, 0, 0]), ('y', pos.y, [0, 1, 0]), ('z', pos.z, [0, 0, 1])):
                 if c != Expr.parse('0'):
                     next_name = f'{name}_{n}'
@@ -51,7 +50,6 @@ class NXPart:
             print(repr(self.o))
             raise NotImplementedError()
 
-        # print(f'rotation {axis}, {angle}')
         # handle the case where angle is not a constant?
         return self.make_nx(NXfield, angle, vector=axis, depends_on=dep, transformation_type='rotation', units=angle_unit)
 

{moreniius-0.2.2 → moreniius-0.2.4}/src/moreniius/writer.py

@@ -113,7 +113,6 @@ class Writer:
                 if absolute_depends_on and 'depends_on' == name and not obj.nxdata.startswith('/'):
                     obj.nxdata = _to_absolute(top_obj.nxpath, obj.nxdata)
                 if obj.nxclass == 'NXfield':
-                    # print(f'to_json_dict for NXfield {name=}')
                     typ, val = convert_types(obj.nxdata, only_nx)
                     # typ is None if obj.nxdata is a NotNXdict (such that val _is_ the contained dict)
                     entry = dict(module='dataset', config=dict(name=name, values=val, type=typ)) if typ else val
@@ -123,7 +122,6 @@ class Writer:
                     if len(list(obj)):
                         entry['children'] = self._to_json_dict(obj, only_nx=only_nx, absolute_depends_on=absolute_depends_on)
                 for n, v in obj.attrs.items():
-                    # print(f'to_json_dict for attribute of {name=}, named {n=}')
                     typ, val = convert_types(v, only_nx)
                     if absolute_depends_on and n == 'depends_on' and '/' != val[0]:
                         val = _to_absolute(top_obj.nxpath, val)

{moreniius-0.2.2 → moreniius-0.2.4/src/moreniius.egg-info}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.1
 Name: moreniius
-Version: 0.2.2
+Version: 0.2.4
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Development Status :: 2 - Pre-Alpha
 Description-Content-Type: text/markdown
-Requires-Dist: zenlog==1.1
-Requires-Dist: platformdirs==3.11
+Requires-Dist: zenlog>=1.1
+Requires-Dist: platformdirs>=3.11
 Requires-Dist: importlib_metadata; python_version < "3.8"
-Requires-Dist: mccode-antlr[hdf5]==0.7.0
-Requires-Dist: nexusformat==1.0.6
+Requires-Dist: mccode-antlr[hdf5]>=0.7.1
+Requires-Dist: nexusformat>=1.0.6
 
 # moreniius
 A project to contain custom components required to use `eniius` to produce `NeXus Structure` `JSON` from `mccode-antlr` simulated instruments.

moreniius-0.2.4/src/moreniius.egg-info/requires.txt

@@ -0,0 +1,7 @@
+zenlog>=1.1
+platformdirs>=3.11
+mccode-antlr[hdf5]>=0.7.1
+nexusformat>=1.0.6
+
+[:python_version < "3.8"]
+importlib_metadata

moreniius-0.2.2/src/moreniius.egg-info/requires.txt

@@ -1,7 +0,0 @@
-zenlog==1.1
-platformdirs==3.11
-mccode-antlr[hdf5]==0.7.0
-nexusformat==1.0.6
-
-[:python_version < "3.8"]
-importlib_metadata