Skip to content

Commit

Permalink
Remove yaml_load_config_file (tardis-sn#2062)
Browse files Browse the repository at this point in the history
* Remove yaml_load_config_file

* updated mailmap

* Updated __init__.py
  • Loading branch information
aman1971 authored and jayantbhakar committed Jul 29, 2022
1 parent 897086f commit 7eeaeb6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .mailmap
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
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
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
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

0 comments on commit 7eeaeb6

Please sign in to comment.