Skip to content

Commit

Permalink
Change yaml.safe_load to YAML(typ='safe',...).load... b/c deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
madeline-scyphers committed Oct 26, 2023
1 parent a83bba4 commit 379f491
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions boa/wrappers/wrapper_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
from functools import wraps
from typing import TYPE_CHECKING, Type

import ruamel.yaml as yaml
from attrs import asdict
from ax.core.base_trial import BaseTrial
from ax.core.parameter import ChoiceParameter, FixedParameter, RangeParameter
from ax.exceptions.core import AxError
from ax.storage.json_store.encoder import object_to_json
from ax.utils.common.docutils import copy_doc
from ruamel.yaml import YAML

from boa.definitions import IS_WINDOWS, PathLike, PathLike_tup
from boa.logger import get_logger
Expand Down Expand Up @@ -229,7 +229,8 @@ def load_yaml_from_str(string: str, render_jinja: bool = True, **kwargs):
"""Load yaml from a string with jinja2 optional templating"""
if render_jinja:
string = render_template(string, **kwargs)
return yaml.safe_load(string)
yaml = YAML(typ="safe", pure=True)
return yaml.load(string)


@copy_doc(load_json)
Expand Down

4 comments on commit 379f491

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
__main__.py90594%83, 135, 166, 211, 219
async_opt.py1061883%137, 182, 189, 192, 212–213, 219–220, 222–223, 225, 232–237, 241
ax_instantiation_utils.py47197%123
controller.py74395%73, 84, 170
definitions.py80100% 
instantiation_base.py40197%39
metaclasses.py72395%50–51, 57
plot.py12120%15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py1412880%51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py80100% 
runner.py51492%52, 86–88
scheduler.py811482%38, 128–131, 138–139, 153, 160–161, 168–169, 264–265
storage.py1241587%83, 115–117, 177, 195, 273–281
template.py29582%52–56
utils.py992079%179, 193–194, 219, 229–233, 235–237, 239, 241, 245–250
config
   __main__.py00100% 
   config.py3073488%33, 211, 217, 221, 223–224, 226, 282, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824
   converters.py751382%14, 22, 41, 46–48, 51–52, 65, 67, 71, 79, 95
metrics
   metric_funcs.py34488%58, 80–81, 83
   metrics.py1011585%127, 304–305, 310–311, 314, 320, 331–333, 337–341
   modular_metric.py1202083%38–41, 43–50, 64, 131, 142, 184, 235–236, 255–256
   synthetic_funcs.py39489%31, 35, 58, 65
scripts
   moo.py30196%44
   run_branin.py34197%56
   script_wrappers.py31293%57–58
   synth_func_cli.py210100% 
wrappers
   base_wrapper.py1953084%63–64, 89–92, 94, 102, 110, 115, 147, 156, 167, 215–216, 218, 267, 269, 271, 275, 330, 402, 416, 589, 591–594, 602, 612
   script_wrapper.py103793%193, 204–205, 273, 279, 327, 332
   synthetic_wrapper.py16287%16, 28
   wrapper_utils.py150994%148–149, 247, 299, 423–425, 433–434
TOTAL223827187% 

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
__main__.py90594%83, 135, 166, 211, 219
async_opt.py1061883%137, 182, 189, 192, 212–213, 219–220, 222–223, 225, 232–237, 241
ax_instantiation_utils.py47197%123
controller.py74395%73, 84, 170
definitions.py80100% 
instantiation_base.py40197%39
metaclasses.py72395%50–51, 57
plot.py12120%15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py1412880%51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py80100% 
runner.py51492%52, 86–88
scheduler.py811482%38, 128–131, 138–139, 153, 160–161, 168–169, 264–265
storage.py1241587%83, 115–117, 177, 195, 273–281
template.py29582%52–56
utils.py992079%179, 193–194, 219, 229–233, 235–237, 239, 241, 245–250
config
   __main__.py00100% 
   config.py3073488%33, 211, 217, 221, 223–224, 226, 282, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824
   converters.py751382%14, 22, 41, 46–48, 51–52, 65, 67, 71, 79, 95
metrics
   metric_funcs.py34488%58, 80–81, 83
   metrics.py1011585%127, 304–305, 310–311, 314, 320, 331–333, 337–341
   modular_metric.py1202083%38–41, 43–50, 64, 131, 142, 184, 235–236, 255–256
   synthetic_funcs.py39489%31, 35, 58, 65
scripts
   moo.py30196%44
   run_branin.py34197%56
   script_wrappers.py31293%57–58
   synth_func_cli.py210100% 
wrappers
   base_wrapper.py1953084%63–64, 89–92, 94, 102, 110, 115, 147, 156, 167, 215–216, 218, 267, 269, 271, 275, 330, 402, 416, 589, 591–594, 602, 612
   script_wrapper.py103793%193, 204–205, 273, 279, 327, 332
   synthetic_wrapper.py16287%16, 28
   wrapper_utils.py150994%148–149, 247, 299, 423–425, 433–434
TOTAL223827187% 

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
__main__.py90594%83, 135, 166, 211, 219
async_opt.py1061883%137, 182, 189, 194, 212–213, 219–220, 222–223, 225, 232–237, 241
ax_instantiation_utils.py47197%123
controller.py74395%73, 84, 170
definitions.py80100% 
instantiation_base.py40197%39
metaclasses.py72395%50–51, 57
plot.py12120%15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py1412880%51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py80100% 
runner.py51492%52, 86–88
scheduler.py811482%38, 128–131, 138–139, 153, 160–161, 168–169, 264–265
storage.py1241587%83, 115–117, 177, 195, 273–281
template.py29582%52–56
utils.py992079%179, 193–194, 219, 229–233, 235–237, 239, 241, 245–250
config
   __main__.py00100% 
   config.py3073488%33, 211, 217, 221, 223–224, 226, 282, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824
   converters.py751382%14, 22, 41, 46–48, 51–52, 65, 67, 71, 79, 95
metrics
   metric_funcs.py34488%58, 80–81, 83
   metrics.py1011585%127, 304–305, 310–311, 314, 320, 331–333, 337–341
   modular_metric.py1202083%38–41, 43–50, 64, 131, 142, 184, 235–236, 255–256
   synthetic_funcs.py39489%31, 35, 58, 65
scripts
   moo.py30196%44
   run_branin.py34197%56
   script_wrappers.py31293%57–58
   synth_func_cli.py210100% 
wrappers
   base_wrapper.py1953084%63–64, 89–92, 94, 102, 110, 115, 147, 156, 167, 215–216, 218, 267, 269, 271, 275, 330, 402, 416, 589, 591–594, 602, 612
   script_wrapper.py103793%193, 204–205, 273, 279, 327, 332
   synthetic_wrapper.py16287%16, 28
   wrapper_utils.py150994%148–149, 247, 299, 423–425, 433–434
TOTAL223827187% 

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
__main__.py90594%83, 135, 166, 211, 219
async_opt.py1061883%137, 182, 189, 194, 212–213, 219–220, 222–223, 225, 232–237, 241
ax_instantiation_utils.py47197%123
controller.py74395%73, 84, 170
definitions.py80100% 
instantiation_base.py40197%39
metaclasses.py72395%50–51, 57
plot.py12120%15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py1412880%51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py80100% 
runner.py51492%52, 86–88
scheduler.py811482%38, 128–131, 138–139, 153, 160–161, 168–169, 264–265
storage.py1241587%83, 115–117, 177, 195, 273–281
template.py29582%52–56
utils.py992079%179, 193–194, 219, 229–233, 235–237, 239, 241, 245–250
config
   __main__.py00100% 
   config.py3073488%33, 211, 217, 221, 223–224, 226, 282, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824
   converters.py751382%14, 22, 41, 46–48, 51–52, 65, 67, 71, 79, 95
metrics
   metric_funcs.py34488%58, 80–81, 83
   metrics.py1011585%127, 304–305, 310–311, 314, 320, 331–333, 337–341
   modular_metric.py1202083%38–41, 43–50, 64, 131, 142, 184, 235–236, 255–256
   synthetic_funcs.py39489%31, 35, 58, 65
scripts
   moo.py30196%44
   run_branin.py34197%56
   script_wrappers.py31293%57–58
   synth_func_cli.py210100% 
wrappers
   base_wrapper.py1953084%63–64, 89–92, 94, 102, 110, 115, 147, 156, 167, 215–216, 218, 267, 269, 271, 275, 330, 402, 416, 589, 591–594, 602, 612
   script_wrapper.py103793%193, 204–205, 273, 279, 327, 332
   synthetic_wrapper.py16287%16, 28
   wrapper_utils.py150994%148–149, 247, 299, 423–425, 433–434
TOTAL223827187% 

Please sign in to comment.