Skip to content

Commit da93d40

Browse files
committed
remove parse_waveform_from_file as it is currently not used
1 parent 98f3106 commit da93d40

File tree

3 files changed

+6
-41
lines changed

3 files changed

+6
-41
lines changed

tests/test_yaml_parser.py

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
from waveform_editor.yaml_parser import YamlParser
1111

1212

13-
def test_yaml_parser_from_string():
13+
def test_yaml_parser():
1414
"""Test loading a yaml file as a string."""
1515
# Valid YAML
1616
with open("tests/tendencies/test_yaml/test.yaml") as file:
1717
yaml_file = file.read()
1818
yaml_parser = YamlParser()
19-
yaml_parser.parse_waveforms_from_string(yaml_file)
19+
yaml_parser.parse_waveforms(yaml_file)
2020
assert_tendencies_correct(yaml_parser.waveform.tendencies)
2121
assert not yaml_parser.waveform.annotations
2222
assert not yaml_parser.has_yaml_error
@@ -25,41 +25,15 @@ def test_yaml_parser_from_string():
2525
with open("tests/tendencies/test_yaml/test_invalid_config.yaml") as file:
2626
yaml_file = file.read()
2727
yaml_parser = YamlParser()
28-
yaml_parser.parse_waveforms_from_string(yaml_file)
28+
yaml_parser.parse_waveforms(yaml_file)
2929
assert yaml_parser.waveform.annotations
3030
assert not yaml_parser.has_yaml_error
3131

3232
# Invalid YAML
3333
with open("tests/tendencies/test_yaml/test_invalid_yaml.yaml") as file:
3434
yaml_file = file.read()
3535
yaml_parser = YamlParser()
36-
yaml_parser.parse_waveforms_from_string(yaml_file)
37-
assert yaml_parser.waveform.annotations
38-
assert yaml_parser.has_yaml_error
39-
40-
41-
def test_yaml_parser_from_file():
42-
"""Test loading a yaml file as a file."""
43-
# Valid YAML
44-
yaml_parser = YamlParser()
45-
yaml_parser.parse_waveforms_from_file("tests/tendencies/test_yaml/test.yaml")
46-
assert_tendencies_correct(yaml_parser.waveform.tendencies)
47-
assert not yaml_parser.waveform.annotations
48-
assert not yaml_parser.has_yaml_error
49-
50-
# Invalid configuration
51-
yaml_parser = YamlParser()
52-
yaml_parser.parse_waveforms_from_file(
53-
"tests/tendencies/test_yaml/test_invalid_config.yaml"
54-
)
55-
assert yaml_parser.waveform.annotations
56-
assert not yaml_parser.has_yaml_error
57-
58-
# Invalid YAML
59-
yaml_parser = YamlParser()
60-
yaml_parser.parse_waveforms_from_file(
61-
"tests/tendencies/test_yaml/test_invalid_yaml.yaml"
62-
)
36+
yaml_parser.parse_waveforms(yaml_file)
6337
assert yaml_parser.waveform.annotations
6438
assert yaml_parser.has_yaml_error
6539

waveform_editor/waveform_editor_gui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
def update_plot(value):
4242
yaml_alert.visible = error_alert.visible = False
43-
yaml_parser.parse_waveforms_from_string(value)
43+
yaml_parser.parse_waveforms(value)
4444

4545
code_editor.annotations = list(yaml_parser.waveform.annotations)
4646
code_editor.param.trigger("annotations")

waveform_editor/yaml_parser.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,7 @@ class YamlParser:
1616
def __init__(self):
1717
self.waveform = Waveform()
1818

19-
def parse_waveforms_from_file(self, file_path):
20-
"""Loads a YAML file from a file path and stores its tendencies into a list.
21-
22-
Args:
23-
file_path: File path of the YAML file.
24-
"""
25-
with open(file_path) as file:
26-
self.parse_waveforms_from_string(file)
27-
28-
def parse_waveforms_from_string(self, yaml_str):
19+
def parse_waveforms(self, yaml_str):
2920
"""Loads a YAML structure from a string and stores its tendencies into a list.
3021
3122
Args:

0 commit comments

Comments
 (0)