restage 0.1.20__tar.gz → 0.2.0__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 (35) hide show
  1. {restage-0.1.20/src/restage.egg-info → restage-0.2.0}/PKG-INFO +2 -2
  2. {restage-0.1.20 → restage-0.2.0}/pyproject.toml +1 -1
  3. {restage-0.1.20 → restage-0.2.0}/src/restage/range.py +2 -2
  4. {restage-0.1.20 → restage-0.2.0/src/restage.egg-info}/PKG-INFO +2 -2
  5. {restage-0.1.20 → restage-0.2.0}/src/restage.egg-info/requires.txt +1 -1
  6. {restage-0.1.20 → restage-0.2.0}/.github/workflows/pip.yml +0 -0
  7. {restage-0.1.20 → restage-0.2.0}/.github/workflows/wheels.yml +0 -0
  8. {restage-0.1.20 → restage-0.2.0}/.gitignore +0 -0
  9. {restage-0.1.20 → restage-0.2.0}/README.md +0 -0
  10. {restage-0.1.20 → restage-0.2.0}/setup.cfg +0 -0
  11. {restage-0.1.20 → restage-0.2.0}/src/restage/__init__.py +0 -0
  12. {restage-0.1.20 → restage-0.2.0}/src/restage/bifrost_choppers.py +0 -0
  13. {restage-0.1.20 → restage-0.2.0}/src/restage/cache.py +0 -0
  14. {restage-0.1.20 → restage-0.2.0}/src/restage/cspec_choppers.py +0 -0
  15. {restage-0.1.20 → restage-0.2.0}/src/restage/database.py +0 -0
  16. {restage-0.1.20 → restage-0.2.0}/src/restage/emulate.py +0 -0
  17. {restage-0.1.20 → restage-0.2.0}/src/restage/energy.py +0 -0
  18. {restage-0.1.20 → restage-0.2.0}/src/restage/instr.py +0 -0
  19. {restage-0.1.20 → restage-0.2.0}/src/restage/mcpl.py +0 -0
  20. {restage-0.1.20 → restage-0.2.0}/src/restage/run.py +0 -0
  21. {restage-0.1.20 → restage-0.2.0}/src/restage/scan.py +0 -0
  22. {restage-0.1.20 → restage-0.2.0}/src/restage/splitrun.py +0 -0
  23. {restage-0.1.20 → restage-0.2.0}/src/restage/tables.py +0 -0
  24. {restage-0.1.20 → restage-0.2.0}/src/restage.egg-info/SOURCES.txt +0 -0
  25. {restage-0.1.20 → restage-0.2.0}/src/restage.egg-info/dependency_links.txt +0 -0
  26. {restage-0.1.20 → restage-0.2.0}/src/restage.egg-info/entry_points.txt +0 -0
  27. {restage-0.1.20 → restage-0.2.0}/src/restage.egg-info/top_level.txt +0 -0
  28. {restage-0.1.20 → restage-0.2.0}/test/splitRunTest_first.c +0 -0
  29. {restage-0.1.20 → restage-0.2.0}/test/splitRunTest_second.c +0 -0
  30. {restage-0.1.20 → restage-0.2.0}/test/test_cache.py +0 -0
  31. {restage-0.1.20 → restage-0.2.0}/test/test_database.py +0 -0
  32. {restage-0.1.20 → restage-0.2.0}/test/test_energy.py +0 -0
  33. {restage-0.1.20 → restage-0.2.0}/test/test_range.py +0 -0
  34. {restage-0.1.20 → restage-0.2.0}/test/test_scan.py +0 -0
  35. {restage-0.1.20 → restage-0.2.0}/test/test_single.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: restage
3
- Version: 0.1.20
3
+ Version: 0.2.0
4
4
  Author-email: Gregory Tucker <gregory.tucker@ess.eu>
5
5
  Classifier: License :: OSI Approved :: BSD License
6
6
  Description-Content-Type: text/markdown
@@ -8,7 +8,7 @@ Requires-Dist: zenlog==1.1
8
8
  Requires-Dist: platformdirs==3.11
9
9
  Requires-Dist: psutil==5.9.6
10
10
  Requires-Dist: importlib_metadata; python_version < "3.8"
11
- Requires-Dist: mccode-antlr[hdf5]==0.4.0
11
+ Requires-Dist: mccode-antlr[hdf5]==0.4.1
12
12
  Provides-Extra: test
13
13
  Requires-Dist: pytest; extra == "test"
14
14
  Requires-Dist: chopcal; extra == "test"
@@ -9,7 +9,7 @@ dependencies = [
9
9
  'platformdirs==3.11',
10
10
  'psutil==5.9.6',
11
11
  "importlib_metadata; python_version<'3.8'",
12
- 'mccode-antlr[hdf5]==0.4.0',
12
+ 'mccode-antlr[hdf5]==0.4.1',
13
13
  ]
14
14
  readme = "README.md"
15
15
  authors = [
@@ -187,7 +187,7 @@ def parameters_to_scan(parameters: dict[str, Union[list, MRange, Singular]], gri
187
187
  par = 'parameters' if len(oth) > 1 else 'parameter'
188
188
  have = 'have' if len(oth) > 1 else 'has'
189
189
  raise ValueError(f'Parameter {names[i]} has {len(v)} values, but {par} {", ".join(oth)} {have} {n_max}')
190
- return n_max, names, zip(*[v if len(v) > 1 else Singular(v[0], n_max) for v in values])
190
+ 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])
191
191
 
192
192
 
193
193
  def _MRange_or_Singular(s: str):
@@ -224,7 +224,7 @@ def parse_scan_parameters(unparsed: list[str]) -> dict[str, MRange | Singular]:
224
224
  maximum iterations of all the ranges to avoid infinite iterations.
225
225
  """
226
226
  ranges = parse_command_line_parameters(unparsed)
227
- max_length = max([len(v) for v in ranges.values() if isinstance(v, MRange)])
227
+ max_length = max(len(v) if isinstance(v, MRange) else 1 for v in ranges.values())
228
228
  for k, v in ranges.items():
229
229
  if isinstance(v, Singular) and v.maximum is None:
230
230
  ranges[k] = Singular(v.value, max_length)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: restage
3
- Version: 0.1.20
3
+ Version: 0.2.0
4
4
  Author-email: Gregory Tucker <gregory.tucker@ess.eu>
5
5
  Classifier: License :: OSI Approved :: BSD License
6
6
  Description-Content-Type: text/markdown
@@ -8,7 +8,7 @@ Requires-Dist: zenlog==1.1
8
8
  Requires-Dist: platformdirs==3.11
9
9
  Requires-Dist: psutil==5.9.6
10
10
  Requires-Dist: importlib_metadata; python_version < "3.8"
11
- Requires-Dist: mccode-antlr[hdf5]==0.4.0
11
+ Requires-Dist: mccode-antlr[hdf5]==0.4.1
12
12
  Provides-Extra: test
13
13
  Requires-Dist: pytest; extra == "test"
14
14
  Requires-Dist: chopcal; extra == "test"
@@ -1,7 +1,7 @@
1
1
  zenlog==1.1
2
2
  platformdirs==3.11
3
3
  psutil==5.9.6
4
- mccode-antlr[hdf5]==0.4.0
4
+ mccode-antlr[hdf5]==0.4.1
5
5
 
6
6
  [:python_version < "3.8"]
7
7
  importlib_metadata
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes