Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove yaml_load_config_file #2062

Merged
merged 3 commits into from
Jun 27, 2022
Merged

Remove yaml_load_config_file #2062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63ed559
Remove yaml_load_config_file
aman1971 Jun 20, 2022
afebe6f
updated mailmap
aman1971 Jun 20, 2022
6b0e7ae
Updated __init__.py
aman1971 Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .mailmap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Alexander Holas <[email protected]> AlexHls <[email protected]>
Alice Harpole <[email protected]>
Alice Harpole <[email protected]> Alice Harpole <[email protected]>

Aman Kumar <[email protected]>

Andreas Flörs <[email protected]>
Andreas Flörs <[email protected]> Andreas Flörs <[email protected]>
Andreas Flörs <[email protected]> Andreas Flörs <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion tardis/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
# ----------------------------------------------------------------------------

from tardis.base import run_tardis
from tardis.io.util import yaml_load_config_file as yaml_load
from tardis.io.util import yaml_load_file as yaml_load
6 changes: 3 additions & 3 deletions tardis/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def pytest_configure(config):

import pytest
import pandas as pd
from tardis.io.util import yaml_load_config_file
from tardis.io.util import yaml_load_file, YAMLLoader
from tardis.io.config_reader import Configuration
from tardis.simulation import Simulation

Expand Down Expand Up @@ -140,8 +140,8 @@ def tardis_ref_data(tardis_ref_path, generate_reference):

@pytest.fixture(scope="function")
def tardis_config_verysimple():
return yaml_load_config_file(
"tardis/io/tests/data/tardis_configv1_verysimple.yml"
return yaml_load_file(
"tardis/io/tests/data/tardis_configv1_verysimple.yml", YAMLLoader
)


Expand Down
4 changes: 0 additions & 4 deletions tardis/io/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,6 @@ def yaml_load_file(filename, loader=yaml.Loader):
return yaml.load(stream, Loader=loader)


def yaml_load_config_file(filename):
return yaml_load_file(filename, YAMLLoader)


def traverse_configs(base, other, func, *args):
"""
Recursively traverse a base dict or list along with another one
Expand Down