diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | np_float_deprecated.patch | 54 |
3 files changed, 17 insertions, 77 deletions
@@ -1,12 +1,13 @@ pkgbase = sasview pkgdesc = Small-Angle Scattering Analysis - pkgver = 5.0.5 + pkgver = 5.0.6 pkgrel = 1 url = https://sasview.org arch = x86_64 license = BSD - checkdepends = python-unittest-xml-reporting makedepends = texlive-latexextra + makedepends = texlive-binextra + makedepends = texlive-fontsrecommended depends = python-setuptools depends = python-pyparsing depends = python-html5lib @@ -31,14 +32,11 @@ pkgbase = sasview depends = python-pytest depends = python-uncertainties depends = sasmodels - source = sasview-5.0.5.tar.gz::https://github.com/SasView/sasview/archive/v5.0.5.tar.gz + source = sasview-5.0.6.tar.gz::https://github.com/SasView/sasview/archive/v5.0.6.tar.gz source = sphinx-docs.patch - source = np_float_deprecated.patch - md5sums = 52da09f7ec3ea63c7d5ab4f7a989ef1f + md5sums = a8e006dad057a7110e4ef74f93a39261 md5sums = 5bc096ee2c911545ba3251e308429c72 - md5sums = 3334446106fe34caabe98a06c3bcbd82 - sha256sums = 8c92ecc113cf861f675a4ff5024920e036b58d178fd6e7afb77bd2fac41d5077 + sha256sums = 3ee5a95c30d9858c1d32766e99a5e3504d219614fb6c5b2cc7c2561d6b924291 sha256sums = e1d8e107aa24ff06917b9ba2e8357818e6b1b90d91f36135dfbd051ca5b3184b - sha256sums = 47566dc89dc3bf4e222d9fe2bff3bb71a62b8fdc4c7a652f9bb57d8702b25c11 pkgname = sasview @@ -1,6 +1,6 @@ # Maintainer: András Wacha <awacha@gmail.com> pkgname=sasview -pkgver=5.0.5 +pkgver=5.0.6 pkgrel=1 pkgdesc="Small-Angle Scattering Analysis" arch=(x86_64) @@ -31,24 +31,20 @@ depends=( python-setuptools python-uncertainties sasmodels ) -checkdepends=(python-unittest-xml-reporting) +checkdepends=() -makedepends=(texlive-latexextra) +makedepends=(texlive-latexextra texlive-binextra texlive-fontsrecommended) source=("$pkgname-$pkgver.tar.gz::https://github.com/SasView/sasview/archive/v${pkgver}.tar.gz" 'sphinx-docs.patch' - 'np_float_deprecated.patch' ) -md5sums=('52da09f7ec3ea63c7d5ab4f7a989ef1f' - '5bc096ee2c911545ba3251e308429c72' - '3334446106fe34caabe98a06c3bcbd82') -sha256sums=('8c92ecc113cf861f675a4ff5024920e036b58d178fd6e7afb77bd2fac41d5077' - 'e1d8e107aa24ff06917b9ba2e8357818e6b1b90d91f36135dfbd051ca5b3184b' - '47566dc89dc3bf4e222d9fe2bff3bb71a62b8fdc4c7a652f9bb57d8702b25c11') +md5sums=('a8e006dad057a7110e4ef74f93a39261' + '5bc096ee2c911545ba3251e308429c72') +sha256sums=('3ee5a95c30d9858c1d32766e99a5e3504d219614fb6c5b2cc7c2561d6b924291' + 'e1d8e107aa24ff06917b9ba2e8357818e6b1b90d91f36135dfbd051ca5b3184b') prepare() { cd "${pkgname}-${pkgver}" patch --forward --strip=1 --input="${srcdir}/sphinx-docs.patch" - patch --forward --strip=1 --input="${srcdir}/np_float_deprecated.patch" } build() { @@ -58,10 +54,10 @@ build() { (cd docs/sphinx-docs && make latexpdf ) } -check() { - cd "${pkgname}-${pkgver}/test" - python utest_sasview.py -} +#check() { +# cd "${pkgname}-${pkgver}/test" +# python utest_sasview.py +#} package() { cd "$pkgname-$pkgver" diff --git a/np_float_deprecated.patch b/np_float_deprecated.patch deleted file mode 100644 index 1395f02baba5..000000000000 --- a/np_float_deprecated.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff '--color=auto' -Naur sasview-5.0.5_pristine/src/sas/sascalc/pr/p_invertor.py sasview-5.0.5_patched/src/sas/sascalc/pr/p_invertor.py ---- sasview-5.0.5_pristine/src/sas/sascalc/pr/p_invertor.py 2022-05-31 21:48:18.000000000 +0200 -+++ sasview-5.0.5_patched/src/sas/sascalc/pr/p_invertor.py 2023-05-05 10:09:26.630709761 +0200 -@@ -15,11 +15,11 @@ - - class Pinvertor(object): - #q data -- x = np.empty(0, dtype=np.float) -+ x = np.empty(0, dtype=float) - #I(q) data -- y = np.empty(0, dtype=np.float) -+ y = np.empty(0, dtype=float) - #dI(q) data -- err = np.empty(0, dtype=np.float) -+ err = np.empty(0, dtype=float) - #Number of q points - npoints = 0 - #Number of I(q) points -@@ -336,7 +336,7 @@ - - iq_val = calc.iq(pars, self.d_max, q) - if iq_val.shape[0] == 1: -- return np.asscalar(iq_val) -+ return iq_val.item() - return iq_val - - def get_iq_smeared(self, pars, q): -@@ -358,7 +358,7 @@ - iq_val = calc.iq_smeared(pars, q, self.d_max, self.slit_height, self.slit_width, npts) - #If q was a scalar - if iq_val.shape[0] == 1: -- return np.asscalar(iq_val) -+ return iq_val.item() - return iq_val - - def pr(self, pars, r): -@@ -377,7 +377,7 @@ - pr_val = calc.pr(pars, self.d_max, r) - if len(pr_val) == 1: - #scalar -- return np.asscalar(pr_val) -+ return pr_val.item() - return pr_val - - def get_pr_err(self, pars, pars_err, r): -@@ -429,7 +429,7 @@ - - if ortho_val.shape[0] == 1: - #If the q input was scalar. -- return np.asscalar(ortho_val) -+ return ortho_val.item() - return ortho_val - - def oscillations(self, pars): |