restage 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

restage/splitrun.py

@@ -135,14 +135,13 @@ def parse_splitrun_precision(unparsed: list[str]) -> dict[str, float]:
         precision[k] = float(v)
     return precision
 
+def args_fixup(args):
+    """Ensure that arguments match expectations
 
-def parse_splitrun(parser):
-    from .range import parse_scan_parameters
-    from mccode_antlr.run.runner import sort_args
-    import sys
-    sys.argv[1:] = sort_args(sys.argv[1:])
-
-    args = parser.parse_args()
+    - MCPL input and output instance parameters should be dictionaries if present.
+    - NCOUNT needs to be separated into (MIN, COUNT, MAX) values, with multiple
+      specifications of either MIN or MAX checked for consistency
+    """
     if args.mcpl_input_parameters is not None:
         args.mcpl_input_parameters = dict(args.mcpl_input_parameters)
     if args.mcpl_output_parameters is not None:
@@ -160,6 +159,16 @@ def parse_splitrun(parser):
             args.nmax = nmax
         args.ncount = ncount
 
+    return args
+
+def parse_splitrun(parser):
+    from .range import parse_scan_parameters
+    from mccode_antlr.run.runner import sort_args
+    import sys
+    sys.argv[1:] = sort_args(sys.argv[1:])
+
+    args = args_fixup(parser.parse_args())
+
     parameters = parse_scan_parameters(args.parameters)
     precision = parse_splitrun_precision(args.P)
     return args, parameters, precision

{restage-0.8.1.dist-info → restage-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restage
-Version: 0.8.1
+Version: 0.8.2
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License
@@ -17,7 +17,7 @@ Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11
 Requires-Dist: confuse
 Requires-Dist: psutil>=5.9.6
-Requires-Dist: mccode-antlr[hdf5]>=0.15.0
+Requires-Dist: mccode-antlr[hdf5]>=0.15.1
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.8.1.dist-info → restage-0.8.2.dist-info}/RECORD

@@ -10,12 +10,12 @@ restage/mcpl.py,sha256=u7ixerJs4lqKSW2MYndZ2Xpsk8O0S-ZVo735YIy86gc,3223
 restage/range.py,sha256=TjOf4DSKfgoAIcrWQvv6MrtksQpnGJHdsEjVI5K-UfI,8116
 restage/run.py,sha256=bTcQIN9edKMXU_eFdX3E_mtJjwemoARrIUmZqzEGf0E,1475
 restage/scan.py,sha256=Yx8OQSBG6I2_64sW0LIDb0glVKwWoxUQQznASXgDZFQ,1432
-restage/splitrun.py,sha256=M1P4jGHLezSFhvtB4Cgi0TKOzeyuGVigVu56pR7B4ok,27456
+restage/splitrun.py,sha256=5mTSkw-Mm0yq6GAq6oG0NNU7ajVkp_hvLvdcx_HlCj0,27793
 restage/tables.py,sha256=vQf0GkM7ojQbWee_P_Xqfx0-lXLym7x6kyam8CWpB5s,16373
 restage/config/__init__.py,sha256=zFRT9QXgpUJpBncELCQ6by1-kjYp8Li1yJDfqxkHxAA,965
 restage/config/default.yaml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-restage-0.8.1.dist-info/METADATA,sha256=VpQQbxeX9gs8-AwoScUmZCy8WVcNPQFh1o6Xb-Yto-o,7434
-restage-0.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-restage-0.8.1.dist-info/entry_points.txt,sha256=vYNOPxJ4PzG-1GGFSd08jFxhrtKUWAdWzjJQeFBzFJE,116
-restage-0.8.1.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
-restage-0.8.1.dist-info/RECORD,,
+restage-0.8.2.dist-info/METADATA,sha256=nCWaQAwVks6yvGipmOu5L8eNSq9jGnP07G9G74oCSf4,7434
+restage-0.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+restage-0.8.2.dist-info/entry_points.txt,sha256=vYNOPxJ4PzG-1GGFSd08jFxhrtKUWAdWzjJQeFBzFJE,116
+restage-0.8.2.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
+restage-0.8.2.dist-info/RECORD,,