gentoo auto-resync : 09:07:2024 - 12:24:58

3 files changed, 83 insertions, 0 deletions

diff --git a/dev-python/lmfit/Manifest b/dev-python/lmfit/Manifest
index 76ee43af2865..4670f7f29219 100644
--- a/dev-python/lmfit/Manifest
+++ b/dev-python/lmfit/Manifest
@@ -1,3 +1,5 @@
+AUX lmfit-1.3.1-np2.patch 1640 BLAKE2B ea8ce33787c91225a85342f8d98f0b517120110bf317e27f883b2fe945586d67eb46002f94fa7f1ebcecaa453381590170072e68c66128e6805c65c4fa5f50de SHA512 70203c877f516657f784ddcd4851594d69a8e5d0c4120a3e3c55ef50fd1cca3f3121095affa1459234eae9afc62041030036727feabade1234b8b52f7e650044
 DIST lmfit-1.3.1.tar.gz 629917 BLAKE2B 6cb5f478bf0b31ce6fe6ccfc97d216fae63f8efa159b30151896254352d3d0e1667d276101f93d357a0dabc39462bd110f115ff6e89c18739c1728f089f54d89 SHA512 b6766224ecd4c75e09a935ab86041852f22491870191c6b6b8cc0e5a873e7c69cb6f11517afa987289c63fb249a8ceef7c336e1c7c4e19d33a2e1bc04fbe6aa6
+EBUILD lmfit-1.3.1-r1.ebuild 910 BLAKE2B a4df3fc01f2096179c7ff5d848bf97f37bcc053c0503c681557eb10e838cd28ad92696ab42d0c4722aebdd50320c6415d65ab93adf9a3be61476b54077947a76 SHA512 d85666c1ce2eaee47963767e9a2d4356eedda3f57a7e3b2e79c0bc51506ddad478a627c9ac3afe60502e9feb6d96ec6168b5ad51c6bba1d75282d3924637dc36
 EBUILD lmfit-1.3.1.ebuild 822 BLAKE2B 7a43236ff8b3c37e5a8aed44162369cd12c70814ec450b8096866908cfb7bb76c6b63341719cfcd2ca1d193ff6e107c01d00976e053a78df7199acf83f0114ad SHA512 4cd965210d51f91f3814970347e2be6e932cbb2d70bc03852f255df05421289f5e2a51783677945e5c0eb6cea357d4ad303d6d8461a02c55a5f94d4b916772eb
 MISC metadata.xml 440 BLAKE2B 8ccc51be7b30a71352ab62c8b6ffecb643b23f6c8dcd0626b94528f069d2be19ebdafcf77267f16b96d5e03fae056ed7be847c6da7ef87a46237e9746e2a3458 SHA512 1a870a9bbeecca5d7c0078cf36873f02e7dfce5ab0fd67d42a37d57ce6c5326b5184101a0d6342107e991b86f7cbff5f1563a41c271d88f92819c01ff9940fcc
diff --git a/dev-python/lmfit/files/lmfit-1.3.1-np2.patch b/dev-python/lmfit/files/lmfit-1.3.1-np2.patch
new file mode 100644
index 000000000000..6b6bbb2308cf
--- /dev/null
+++ b/dev-python/lmfit/files/lmfit-1.3.1-np2.patch
@@ -0,0 +1,39 @@
+diff --git a/lmfit/parameter.py b/lmfit/parameter.py
+index ca9ccc72..a7ec9a65 100644
+--- a/lmfit/parameter.py
++++ b/lmfit/parameter.py
+@@ -181,9 +181,8 @@ def __reduce__(self):
+         params = [self[k] for k in self]
+ 
+         # find the symbols from _asteval.symtable, that need to be remembered.
+-        sym_unique = self._asteval.user_defined_symbols()
+         unique_symbols = {key: deepcopy(self._asteval.symtable[key])
+-                          for key in sym_unique}
++                          for key in self._asteval.user_defined_symbols()}
+ 
+         return self.__class__, (), {'unique_symbols': unique_symbols,
+                                     'params': params}
+@@ -567,9 +566,8 @@ def dumps(self, **kws):
+ 
+         """
+         params = [p.__getstate__() for p in self.values()]
+-        sym_unique = self._asteval.user_defined_symbols()
+         unique_symbols = {key: encode4js(deepcopy(self._asteval.symtable[key]))
+-                          for key in sym_unique}
++                          for key in self._asteval.user_defined_symbols()}
+         return json.dumps({'unique_symbols': unique_symbols,
+                            'params': params}, **kws)
+ 
+diff --git a/tests/test_model.py b/tests/test_model.py
+index 396ea0b1..24dfbfcd 100644
+--- a/tests/test_model.py
++++ b/tests/test_model.py
+@@ -900,7 +900,7 @@ def test_independent_var_parsing(self):
+         yatan = stepmod2.eval(pars, x=x)
+ 
+         assert (yatan-yline).std() > 0.1
+-        assert (yatan-yline).ptp() > 1.0
++        assert np.ptp(yatan-yline) > 1.0
+ 
+         voigtmod = Model(voigt)
+         assert 'x' in voigtmod.independent_vars
diff --git a/dev-python/lmfit/lmfit-1.3.1-r1.ebuild b/dev-python/lmfit/lmfit-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..7f6e86d4ee69
--- /dev/null
+++ b/dev-python/lmfit/lmfit-1.3.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Non-Linear Least-Squares Minimization and Curve-Fitting for Python"
+HOMEPAGE="
+	https://lmfit.github.io/lmfit-py/
+	https://github.com/lmfit/lmfit-py/
+	https://pypi.org/project/lmfit/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/asteval-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.6[${PYTHON_USEDEP}]
+	>=dev-python/uncertainties-3.1.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-6.2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/lmfit/lmfit-py/pull/959
+	"${FILESDIR}/${P}-np2.patch"
+)
+
+python_test() {
+	epytest -o addopts=
+}