restage 0.8.1__tar.gz → 0.8.3__tar.gz

{restage-0.8.1/src/restage.egg-info → restage-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restage
-Version: 0.8.1
+Version: 0.8.3
 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.2
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.8.1 → restage-0.8.3}/pyproject.toml

@@ -9,7 +9,7 @@ dependencies = [
     'platformdirs>=3.11',
     'confuse',
     'psutil>=5.9.6',
-    'mccode-antlr[hdf5]>=0.15.0',
+    'mccode-antlr[hdf5]>=0.15.2',
 ]
 readme = "README.md"
 license = {text = "BSD-3-Clause"}

{restage-0.8.1 → restage-0.8.3}/src/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 → restage-0.8.3/src/restage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restage
-Version: 0.8.1
+Version: 0.8.3
 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.2
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.8.1 → restage-0.8.3}/src/restage.egg-info/requires.txt

@@ -2,7 +2,7 @@ zenlog>=1.1
 platformdirs>=3.11
 confuse
 psutil>=5.9.6
-mccode-antlr[hdf5]>=0.15.0
+mccode-antlr[hdf5]>=0.15.2
 
 [test]
 pytest