Skip to content

Commit

Permalink
Fixed MorphologySet chunk overlap (#708)
Browse files Browse the repository at this point in the history
* fixed extra simulations name error

* Fixed immutable mapping types

* bumped bsb-hdf5

* a50 - lint & fixes #701

* bumped bsbhdf5
  • Loading branch information
Helveg committed Apr 17, 2023
1 parent e17224f commit 34152d1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion bsb/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "4.0.0a49"
__version__ = "4.0.0a50"

import functools

Expand Down
4 changes: 3 additions & 1 deletion bsb/cli/commands/_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ def handler(self, context):
network = from_storage(context.arguments.network)
config_option = context.options["config"]
sim_name = context.arguments.simulation
extra_simulations = {}
if config_option.is_set("cli"):
extra_simulations = from_file(context.config).simulations
for name, sim in extra_simulations.items():
Expand All @@ -207,7 +208,8 @@ def handler(self, context):
append = ", " if len(network.simulations) else ""
append += ", ".join(f"'{name}'" for name in extra_simulations.keys())
errr.wrap(type(e), e, append=append)
result.write(f"{uuid4()}.nio", "ow")
else:
result.write(f"{uuid4()}.nio", "ow")

def get_options(self):
return {
Expand Down
16 changes: 8 additions & 8 deletions bsb/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,14 @@ class Scaffold:
"""

network: "Network"
regions: typing.Mapping[str, "Region"]
partitions: typing.Mapping[str, "Partition"]
cell_types: typing.Mapping[str, "CellType"]
placement: typing.Mapping[str, "PlacementStrategy"]
after_placement: typing.Mapping[str, "PostProcessingHook"]
connectivity: typing.Mapping[str, "ConnectionStrategy"]
after_connectivity: typing.Mapping[str, "PostProcessingHook"]
simulations: typing.Mapping[str, "Simulation"]
regions: typing.Dict[str, "Region"]
partitions: typing.Dict[str, "Partition"]
cell_types: typing.Dict[str, "CellType"]
placement: typing.Dict[str, "PlacementStrategy"]
after_placement: typing.Dict[str, "PostProcessingHook"]
connectivity: typing.Dict[str, "ConnectionStrategy"]
after_connectivity: typing.Dict[str, "PostProcessingHook"]
simulations: typing.Dict[str, "Simulation"]

def __init__(self, config=None, storage=None, clear=False, comm=None):
"""
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ NEURON==8.2.2
nrn-subprocess==1.3.4

# Plugins
bsb-hdf5==0.7.2
bsb-hdf5==0.7.4
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
long_description = fh.read()

requires = [
"bsb-hdf5~=0.7.2",
"bsb-hdf5~=0.7.4",
"h5py~=3.0",
"numpy~=1.19",
"scipy~=1.5",
Expand Down

0 comments on commit 34152d1

Please sign in to comment.