# Conflicts:
#	est/core/process/process.py
#	est/core/process/pymca/test/test_io.py
#	est/core/process/test/test_roi.py
#	est/core/test/test_types.py
#	est/io/io.py
#	est/setup.py

# Conflicts:
#	est/core/types.py
#	requirements.txt

replace pushworkflow by pypushflow

See merge request workflow/est!28

[CI] refresh CI since depends on pypushflow instead of pushworkflow (old temporary fork of pyspuhflow)

add black hook

See merge request workflow/est!27

[core][mback_norm] enforce computing preedge each time. Looks like if pre2 is not provided it fails now (v 0.9.48)

Mauro evals

See merge request workflow/est!25

# Conflicts:
#   est/io/io.py