Skip to content

Commit

Permalink
MAINT: Remove ESPEI 0.9 deprecations (plotting and scheduler="None") (#…
Browse files Browse the repository at this point in the history
…257)

Remove deprecated functionality scheduled for removal in ESPEI 0.9:
- `espei.plot`: 
  - `plot_parameters`, replaced with `plot_interaction` and `plot_endmember`
  - `eqdataplot` and `multiplot`, replace with calling appropriate PyCalphad phase diagram plotting function and `espei.plot.dataplot`
  - `_compare_data_to_parameters` only used by the above functions
- YAML input: `scheduler = "None"`, replaced by `scheduler = null`
  • Loading branch information
bocklund authored Aug 9, 2024
1 parent 227eac8 commit 281561f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 416 deletions.
6 changes: 0 additions & 6 deletions espei/espei_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@ def get_run_settings(input_dict):
if run_settings['mcmc'].get('restart_trace') is None:
run_settings['mcmc']['chains_per_parameter'] = run_settings['mcmc'].get('chains_per_parameter', 2)
run_settings['mcmc']['chain_std_deviation'] = run_settings['mcmc'].get('chain_std_deviation', 0.1)
if run_settings['mcmc']['scheduler'] == 'None':
warnings.warn(
"Setting scheduler to the string 'None' will be deprecated in ESPEI "
"0.9. Use `null` in YAML or `None` in Python.", FutureWarning
)
run_settings['mcmc']['scheduler'] = None
if not schema.validate(run_settings):
raise ValueError(schema.errors)
if run_settings.get("generate_parameters") is not None:
Expand Down
4 changes: 2 additions & 2 deletions espei/input-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ mcmc:
required: True
scheduler: # scheduler to use for parallelization
type: string
default: dask # dask | None | A JSON file
regex: 'dask|None|.*\.json$'
default: dask # dask | A JSON file
regex: 'dask|.*\.json$'
required: True
nullable: True
cores:
Expand Down
Loading

0 comments on commit 281561f

Please sign in to comment.