Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit 3c887d7

Browse files
author
Jaquier Aurélien Tristan
committed
fix arbor tests with latest arbor version
1 parent aff67f8 commit 3c887d7

20 files changed

+21
-19
lines changed

bluepyopt/ephys/morphologies.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,8 @@ def load(morpho_filename, replace_axon):
307307
morpho = arbor.load_component(morpho_filename).component
308308
elif morpho_suffix == '.swc':
309309
morpho = arbor.load_swc_arbor(morpho_filename)
310+
# turn loaded_morphology into morphology type
311+
morpho = arbor.morphology(morpho.segment_tree)
310312
elif morpho_suffix == '.asc':
311313
morpho = arbor.load_asc(morpho_filename).morphology
312314
else:

bluepyopt/ephys/templates/acc/decor_acc_template.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(arbor-component
2-
(meta-data (version "0.1-dev"))
2+
(meta-data (version "0.9-dev"))
33
(decor
44
{%- for mech, params in global_mechs.items() %}
55
{%- if mech is not none %}

bluepyopt/ephys/templates/acc/label_dict_acc_template.jinja2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(arbor-component
2-
(meta-data (version "0.1-dev"))
2+
(meta-data (version "0.9-dev"))
33
(label-dict
44
{%- for loc, label in label_dict.items() %}
55
{{ label.defn }}

bluepyopt/tests/test_ephys/test_create_acc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ def run_short_sim(cable_cell):
537537
arb_cell_model.properties.catalogue.extend(arbor.bbp_catalogue(), "BBP::")
538538

539539
# Run a very short simulation to test mechanism instantiation
540-
arb_cell_model.run(tfinal=0.1)
540+
arb_cell_model.run(tfinal=0.1 *arbor.units.ms)
541541

542542

543543
@pytest.mark.unit

bluepyopt/tests/test_ephys/testdata/acc/CCell/CCell_decor.acc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(arbor-component
2-
(meta-data (version "0.1-dev"))
2+
(meta-data (version "0.9-dev"))
33
(decor
44
(default (gSKv3_1bar_SKv3_1 65))
55
(paint (region "soma") (gSKv3_1bar_SKv3_1 65))

bluepyopt/tests/test_ephys/testdata/acc/CCell/CCell_label_dict.acc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(arbor-component
2-
(meta-data (version "0.1-dev"))
2+
(meta-data (version "0.9-dev"))
33
(label-dict
44
(region-def "all" (all))
55
(region-def "apic" (tag 4))

bluepyopt/tests/test_ephys/testdata/acc/CCell/simple_axon_replacement.acc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(arbor-component
22
(meta-data
3-
(version "0.1-dev"))
3+
(version "0.9-dev"))
44
(morphology
55
(branch 0 -1
66
(segment 0

bluepyopt/tests/test_ephys/testdata/acc/expsyn/simple_cell_decor.acc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(arbor-component
2-
(meta-data (version "0.1-dev"))
2+
(meta-data (version "0.9-dev"))
33
(decor
44
(paint (region "soma") (membrane-capacitance 0.01))
55
(paint (region "soma") (density (mechanism "default::pas")))

bluepyopt/tests/test_ephys/testdata/acc/expsyn/simple_cell_label_dict.acc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(arbor-component
2-
(meta-data (version "0.1-dev"))
2+
(meta-data (version "0.9-dev"))
33
(label-dict
44
(region-def "all" (all))
55
(region-def "soma" (tag 1))

bluepyopt/tests/test_ephys/testdata/acc/l5pc/C060114A7_axon_replacement.acc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(arbor-component
22
(meta-data
3-
(version "0.1-dev"))
3+
(version "0.9-dev"))
44
(morphology
55
(branch 0 -1
66
(segment 0

0 commit comments

Comments
 (0)