Merge pull request #310319 from annaleeleaves/dill-dep-lmfit
python31{1,2}Packages.lmfit: unbreak
This commit is contained in:
commit
eadc10a2b2
1 changed files with 4 additions and 9 deletions
|
@ -4,6 +4,7 @@
|
||||||
setuptools,
|
setuptools,
|
||||||
setuptools-scm,
|
setuptools-scm,
|
||||||
asteval,
|
asteval,
|
||||||
|
dill,
|
||||||
numpy,
|
numpy,
|
||||||
scipy,
|
scipy,
|
||||||
uncertainties,
|
uncertainties,
|
||||||
|
@ -16,7 +17,7 @@ buildPythonPackage rec {
|
||||||
pname = "lmfit";
|
pname = "lmfit";
|
||||||
version = "1.3.0";
|
version = "1.3.0";
|
||||||
|
|
||||||
format = "pyproject";
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.cfg --replace "--cov=lmfit --cov-report html" ""
|
substituteInPlace pyproject.toml --replace "--cov=lmfit --cov-report html" ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -34,6 +35,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
asteval
|
asteval
|
||||||
|
dill
|
||||||
numpy
|
numpy
|
||||||
scipy
|
scipy
|
||||||
uncertainties
|
uncertainties
|
||||||
|
@ -45,13 +47,6 @@ buildPythonPackage rec {
|
||||||
matplotlib
|
matplotlib
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTests = [
|
|
||||||
# https://github.com/lmfit/lmfit-py/issues/878
|
|
||||||
"test_emcee_multiprocessing"
|
|
||||||
"test_explicit_independent_vars"
|
|
||||||
"test_result_eval_custom_x"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Least-Squares Minimization with Bounds and Constraints";
|
description = "Least-Squares Minimization with Bounds and Constraints";
|
||||||
homepage = "https://lmfit-py.readthedocs.io/";
|
homepage = "https://lmfit-py.readthedocs.io/";
|
||||||
|
|
Loading…
Reference in a new issue