restage 0.1.20__py3-none-any.whl → 0.2.0__py3-none-any.whl

restage/range.py

@@ -187,7 +187,7 @@ def parameters_to_scan(parameters: dict[str, Union[list, MRange, Singular]], gri
                 par = 'parameters' if len(oth) > 1 else 'parameter'
                 have = 'have' if len(oth) > 1 else 'has'
                 raise ValueError(f'Parameter {names[i]} has {len(v)} values, but {par} {", ".join(oth)} {have} {n_max}')
-        return n_max, names, zip(*[v if len(v) > 1 else Singular(v[0], n_max) for v in values])
+        return n_max, names, zip(*[v if len(v) > 1 else Singular(v[0] if isinstance(v, MRange) else v.value, n_max) for v in values])
 
 
 def _MRange_or_Singular(s: str):
@@ -224,7 +224,7 @@ def parse_scan_parameters(unparsed: list[str]) -> dict[str, MRange | Singular]:
              maximum iterations of all the ranges to avoid infinite iterations.
     """
     ranges = parse_command_line_parameters(unparsed)
-    max_length = max([len(v) for v in ranges.values() if isinstance(v, MRange)])
+    max_length = max(len(v) if isinstance(v, MRange) else 1 for v in ranges.values())
     for k, v in ranges.items():
         if isinstance(v, Singular) and v.maximum is None:
             ranges[k] = Singular(v.value, max_length)

{restage-0.1.20.dist-info → restage-0.2.0.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: restage
-Version: 0.1.20
+Version: 0.2.0
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 Classifier: License :: OSI Approved :: BSD License
 Description-Content-Type: text/markdown
 Requires-Dist: zenlog ==1.1
 Requires-Dist: platformdirs ==3.11
 Requires-Dist: psutil ==5.9.6
-Requires-Dist: mccode-antlr[hdf5] ==0.4.0
+Requires-Dist: mccode-antlr[hdf5] ==0.4.1
 Requires-Dist: importlib-metadata ; python_version < "3.8"
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'

{restage-0.1.20.dist-info → restage-0.2.0.dist-info}/RECORD

@@ -7,13 +7,13 @@ restage/emulate.py,sha256=VrhfZJIbECdbDS-MHklqRuAIy9cRkjZkwPBTKQSQoe0,6164
 restage/energy.py,sha256=ltuMfByx3uwU8IBBriENbIH5EEfKdZ1-w84Urkcs0xM,2664
 restage/instr.py,sha256=G8iaXbgN0JKgv37S1oDuf0mEl2WP9VFuwAGeA0yw0R4,2412
 restage/mcpl.py,sha256=0F9A_edwSR9awQipicI3ipsMAJFk9zCspJhCOrmhkDg,2407
-restage/range.py,sha256=hOQsiHXSt1OEX8ZcvfmzQN4f2Mo7paX681TZCdvSkTk,8073
+restage/range.py,sha256=TjOf4DSKfgoAIcrWQvv6MrtksQpnGJHdsEjVI5K-UfI,8116
 restage/run.py,sha256=nk8d7cIyIqSt-5pyGm68Zak5H1a-fbo_z2_36eN-08E,1481
 restage/scan.py,sha256=Yx8OQSBG6I2_64sW0LIDb0glVKwWoxUQQznASXgDZFQ,1432
 restage/splitrun.py,sha256=zCm9CHoD8Jr4_Db9FFzJz3ZyV5oxUXI_UfVhmYxUrYw,23161
 restage/tables.py,sha256=VMApcu4KtsBlUvAqCSKHDZ58FXhNPihr90OU12YAejw,15764
-restage-0.1.20.dist-info/METADATA,sha256=TLE8O3UVIM6P1CfKx-nm1sgqLl4ifL80c5HJqfa-o1c,4774
-restage-0.1.20.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-restage-0.1.20.dist-info/entry_points.txt,sha256=dY3ZanXW6rBLd2vBo-WMcbgO7E10GVDE0t9GASuVjgY,90
-restage-0.1.20.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
-restage-0.1.20.dist-info/RECORD,,
+restage-0.2.0.dist-info/METADATA,sha256=dxDhBWgp75U3mA1Or2ebd1oLRo_Hbuqwx4tIS6Byk_g,4773
+restage-0.2.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+restage-0.2.0.dist-info/entry_points.txt,sha256=dY3ZanXW6rBLd2vBo-WMcbgO7E10GVDE0t9GASuVjgY,90
+restage-0.2.0.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
+restage-0.2.0.dist-info/RECORD,,