Updating `devel` with `master` changes#342

Merged

Didou09 merged 9 commits intodevelfrom

Feb 5, 2020

Commits on Jan 30, 2020

Merge pull request #339 from ToFuProject/devel
Didou09
authored

Commits on Jan 31, 2020

Merge branch 'devel'
VEZINET Didier
committed
[1.4.2] Added docstr to MultiIDSLoader.open_get_close(), and try to force tagged commit on master
VEZINET Didier
committed
[1.4.2] Forcing version number by typing in tofu/version.py and using git commit --no-verify
VEZINET Didier
committed
[bf #340] trying to solve deployment issues
lasofivec
committed
[bf #340] added back package_dir
lasofivec
committed

Commits on Feb 3, 2020

Merge remote-tracking branch 'origin/devel'
VEZINET Didier
committed
[1.4.2 Hotfix] Added extra keyword to tofuplot to plot data without equilibrium / heating
VEZINET Didier
committed
[1.4.2 Hotfix] Added --extra to tofucalc and synthdiag=True to simplify code in tofu/utils.calc_from_imas()
VEZINET Didier
committed