fm-weck 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

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 (6) hide show
  1. fm_weck/__init__.py +1 -1
  2. fm_weck/serve.py +11 -5
  3. {fm_weck-1.1.2.dist-info → fm_weck-1.1.3.dist-info}/METADATA +1 -1
  4. {fm_weck-1.1.2.dist-info → fm_weck-1.1.3.dist-info}/RECORD +6 -6
  5. {fm_weck-1.1.2.dist-info → fm_weck-1.1.3.dist-info}/WHEEL +0 -0
  6. {fm_weck-1.1.2.dist-info → fm_weck-1.1.3.dist-info}/entry_points.txt +0 -0
fm_weck/__init__.py CHANGED
@@ -8,4 +8,4 @@
8
8
  from .config import Config # noqa: F401
9
9
  from .image_mgr import ImageMgr # noqa: F401
10
10
 
11
- __version__ = "1.1.2"
11
+ __version__ = "1.1.3"
fm_weck/serve.py CHANGED
@@ -11,7 +11,7 @@ import os
11
11
  import shutil
12
12
  import sys
13
13
  from pathlib import Path
14
- from typing import Optional, Tuple
14
+ from typing import Optional, Tuple, Union
15
15
 
16
16
  from fm_tools import FmData
17
17
  from fm_tools.benchexec_helper import DataModel
@@ -55,9 +55,11 @@ def update_checksum(shelve_space: Path, checksum: str, config: Config):
55
55
 
56
56
 
57
57
  def setup_fm_tool(
58
- fm_tool: Path, version: Optional[str], configuration: Config, skip_download: bool = False
58
+ fm_tool: Union[Path, FmData], version: Optional[str], configuration: Config, skip_download: bool = False
59
59
  ) -> Tuple[FmData, Path]:
60
- fm_data = parse_fm_data(fm_tool, version)
60
+ # Don't explicitly disallow non-FmData here; Pythonic Users might want to exchange the FmData object
61
+ # by a class with the same interface
62
+ fm_data = parse_fm_data(fm_tool, version) if isinstance(fm_tool, (Path, str)) else fm_tool
61
63
 
62
64
  shelve_space = configuration.get_shelve_space_for(fm_data)
63
65
  logger.debug("Using shelve space %s", shelve_space)
@@ -78,7 +80,7 @@ def setup_fm_tool(
78
80
 
79
81
 
80
82
  def run_guided(
81
- fm_tool: Path,
83
+ fm_tool: Union[Path, FmData],
82
84
  version: Optional[str],
83
85
  configuration: Config,
84
86
  prop: Optional[Path],
@@ -123,7 +125,11 @@ def run_guided(
123
125
 
124
126
 
125
127
  def run_manual(
126
- fm_tool: Path, version: Optional[str], configuration: Config, command: list[str], skip_download: bool = False
128
+ fm_tool: Union[Path, FmData],
129
+ version: Optional[str],
130
+ configuration: Config,
131
+ command: list[str],
132
+ skip_download: bool = False,
127
133
  ):
128
134
  fm_data, shelve_space = setup_fm_tool(fm_tool, version, configuration, skip_download)
129
135
  engine = Engine.from_config(fm_data, configuration)
{fm_weck-1.1.2.dist-info → fm_weck-1.1.3.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: fm-weck
3
- Version: 1.1.2
3
+ Version: 1.1.3
4
4
  Author-email: Henrik Wachowitz <henrik.wachowitz@ifi.lmu.de>
5
5
  Maintainer-email: Henrik Wachowitz <henrik.wachowitz@ifi.lmu.de>
6
6
  Classifier: Development Status :: 4 - Beta
{fm_weck-1.1.2.dist-info → fm_weck-1.1.3.dist-info}/RECORD RENAMED
@@ -1,10 +1,10 @@
1
- fm_weck/__init__.py,sha256=1E-Lg-govulF5LWnCDMllOTz1s69LYKB4s0zfiimigk,351
1
+ fm_weck/__init__.py,sha256=uwLCU8RS2vEMyuRQE53-wbTPXN4-jf50Esc6YbSyoHo,351
2
2
  fm_weck/__main__.py,sha256=E7z4-9t6To3hbIPjRPu6iW17YCrtqpDSbFSpd9pX4NA,350
3
3
  fm_weck/cli.py,sha256=eeL3GbYO6W5af47ZgIR0mKYug0OrFsJn0Md1aVLDITI,10582
4
4
  fm_weck/config.py,sha256=6f4R-iWmWehHghuhoU-UyCpNotYFec_oDelJB4A15BQ,4861
5
5
  fm_weck/engine.py,sha256=nstV_H_vhBbBUik95mUotcaPQLsRiTu92YgrWmKJgeM,10102
6
6
  fm_weck/image_mgr.py,sha256=kZxcZaMiv5orWO7bLsN7xaQRXjof8uOGud7sb57ZvRo,1655
7
- fm_weck/serve.py,sha256=DpeAbq1A2mV7uuKZnPOUF4hjbilxaLAJtnLiz_Q0Erw,4646
7
+ fm_weck/serve.py,sha256=spNnhQvGbpUKlpkzwJLDkU50xTVjp9WHl75Ve8sea6Q,4910
8
8
  fm_weck/resources/Containerfile,sha256=MltxP1of9klsQFNR8WyngRTJrPwxQTF4C9ennRxVqSo,391
9
9
  fm_weck/resources/__init__.py,sha256=ewuOXBraX5Tb8XkWE6xrv0cwrxG4r5Ckj5n_tRjeRf4,946
10
10
  fm_weck/resources/run_with_overlay.sh,sha256=IOonRSjdoNoMj0tcrdZvqO-x6WZldjpOetvssP6qbSM,872
@@ -124,7 +124,7 @@ fm_weck/resources/fm_tools/wasp-c.yml,sha256=NWEb2vpIBu75kZJdEq0am8Mpi2HFu5nhDI1
124
124
  fm_weck/resources/fm_tools/wit4java.yml,sha256=SukwwE46DsDmZouAwHhr_aaOjxIaeOrIS7o7P4eDWX0,1243
125
125
  fm_weck/resources/fm_tools/witch.yml,sha256=5d5aYmkrlG78M-RLdDbdi6EJWOfD0CskWtJWGXtwEyI,1152
126
126
  fm_weck/resources/fm_tools/witnesslint.yml,sha256=Y6A2TXPyjVxZ9Fhmyd7GOKY7x1_jXjshvmrIM4uW96A,3085
127
- fm_weck-1.1.2.dist-info/METADATA,sha256=yR302Kub6tHGgbImtPQaOupb1zCRy2HTF5Nme-GH09I,2771
128
- fm_weck-1.1.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
129
- fm_weck-1.1.2.dist-info/entry_points.txt,sha256=toWpKCSY1u593MPnI_xW5gnwlnkerP4AvmPQ1s2nPgY,50
130
- fm_weck-1.1.2.dist-info/RECORD,,
127
+ fm_weck-1.1.3.dist-info/METADATA,sha256=3dgYMCD7Quom9uqw0y5mSRMtmzH_VxSoGg8olrxlnq4,2771
128
+ fm_weck-1.1.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
129
+ fm_weck-1.1.3.dist-info/entry_points.txt,sha256=toWpKCSY1u593MPnI_xW5gnwlnkerP4AvmPQ1s2nPgY,50
130
+ fm_weck-1.1.3.dist-info/RECORD,,