Skip to content

Commit

Permalink
Skip simulations with empty path in the sim campaign config
Browse files Browse the repository at this point in the history
 Fix regression in blueetl 0.8.0
  • Loading branch information
GianlucaFicarelli committed Sep 30, 2024
1 parent 859af02 commit d64d25d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 4 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Changelog
=========

Version 0.11.5
--------------

Bug Fixes
~~~~~~~~~

- Skip simulations with empty path in the simulation campaign configuration (fix regression in blueetl 0.8.0).


Version 0.11.4
--------------

Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ ignored-modules = ["bluepy"]
[tool.pylint.design]
# Maximum number of arguments for function / method.
max-args = 8
# Maximum number of positional arguments for function / method.
max-positional-arguments = 10
# Maximum number of attributes for a class (see R0902).
max-attributes = 40
# Maximum number of boolean expressions in an if statement (see R0916).
Expand Down
2 changes: 1 addition & 1 deletion src/blueetl/adapters/circuit.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class CircuitAdapter(BaseAdapter[CircuitInterface]):
def from_file(cls, filepath: Optional[Path]) -> "CircuitAdapter":
"""Load and return a new object from file."""
# pylint: disable=import-outside-toplevel
if not filepath or not filepath.exists():
if not filepath or not filepath.is_file():
return cls(None)
CircuitImpl: type[CircuitInterface]
if filepath.suffix == ".json":
Expand Down
2 changes: 1 addition & 1 deletion src/blueetl/adapters/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SimulationAdapter(BaseAdapter[SimulationInterface]):
def from_file(cls, filepath: Optional[Path]) -> "SimulationAdapter":
"""Load and return a new object from file."""
# pylint: disable=import-outside-toplevel
if not filepath or not filepath.exists():
if not filepath or not filepath.is_file():
return cls(None)
SimulationImpl: type[SimulationInterface]
if filepath.suffix == ".json":
Expand Down
10 changes: 8 additions & 2 deletions tests/unit/adapters/test_simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,14 @@ def test_simulation_adapter(path, population, reports, expected_classes, monkeyp
assert sorted(loaded._impl.__dict__) == ["_simulation"]


def test_simulation_adapter_with_nonexistent_path():
path = Path("path/to/simulation_config.json")
@pytest.mark.parametrize(
"path",
[
Path("path/to/missing/simulation_config.json"),
Path(""), # not a file
],
)
def test_simulation_adapter_with_nonexistent_path(path):
obj = test_module.SimulationAdapter.from_file(path)

assert obj.instance is None
Expand Down

0 comments on commit d64d25d

Please sign in to comment.