summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Horel2024-02-06 11:03:49 -0500
committerGuillaume Horel2024-02-06 11:04:23 -0500
commit787b374fca5c6cf13c84ec753dad17d934ee5024 (patch)
tree9bb9f45c508dbdf243dbd45b3f59e0b32322012e
parentc2b2963471a540790acd308796e238a5996d2310 (diff)
downloadaur-787b374fca5c6cf13c84ec753dad17d934ee5024.tar.gz
bump to 1.4.2 (unreleased)
cython3 fixes
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD25
-rw-r--r--cython3.patch45
3 files changed, 64 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9561f74dc0a5..3cc1c71a1d3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = python-pynfft
pkgdesc = Python wrapper to the NFFT library.
- pkgver = 1.3.2
+ pkgver = 1.4.2
pkgrel = 1
url = https://github.com/pyNFFT/pyNFFT
arch = x86_64
@@ -8,12 +8,14 @@ pkgbase = python-pynfft
checkdepends = python-nose
makedepends = cython
depends = nfft
+ depends = python
source = https://pypi.org/packages/source/p/pyNFFT/pyNFFT-1.3.2.tar.gz
source = new-api.patch
source = rewrite_hidden_symbols.patch
+ source = cython3.patch
sha256sums = ae41e720e569d0d99e3a44c82c36b35a49cfc9ecc23a1cd039fe9e2895aada2c
sha256sums = d44f3144cd2ace01f021f67b724cd4036c37c9b1fbcf85521788875216666f0b
sha256sums = 65a1407fddbc1cab3c6415e6341f79f8d14aa816fd9438a521f38390879cf7fb
+ sha256sums = e4856002b58c3b4e5853d1efda2759fb1d97dcb1e896dd923c1f520a4c3b3ad6
pkgname = python-pynfft
-
diff --git a/PKGBUILD b/PKGBUILD
index 5b59a6774c08..f00a82233a8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,45 @@
pkgname='python-pynfft'
_pkgname='pyNFFT'
-pkgver=1.3.2
+pkgver=1.4.2
+_pkgver=1.3.2
pkgrel=1
pkgdesc="Python wrapper to the NFFT library."
arch=('x86_64')
url="https://github.com/pyNFFT/pyNFFT"
license=('GPL3')
checkdepends=('python-nose')
-depends=('nfft')
+depends=(nfft python)
makedepends=('cython')
-source=("https://pypi.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
- "new-api.patch"
- "rewrite_hidden_symbols.patch")
+source=("https://pypi.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$_pkgver.tar.gz"
+ new-api.patch
+ rewrite_hidden_symbols.patch
+ cython3.patch
+)
sha256sums=('ae41e720e569d0d99e3a44c82c36b35a49cfc9ecc23a1cd039fe9e2895aada2c'
'd44f3144cd2ace01f021f67b724cd4036c37c9b1fbcf85521788875216666f0b'
- '65a1407fddbc1cab3c6415e6341f79f8d14aa816fd9438a521f38390879cf7fb')
+ '65a1407fddbc1cab3c6415e6341f79f8d14aa816fd9438a521f38390879cf7fb'
+ 'e4856002b58c3b4e5853d1efda2759fb1d97dcb1e896dd923c1f520a4c3b3ad6')
prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${_pkgname}-${_pkgver}"
patch -p1 < ../new-api.patch
patch -p1 < ../rewrite_hidden_symbols.patch
+ patch -p1 < ../cython3.patch
}
build(){
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${_pkgname}-${_pkgver}"
python setup.py build_ext --inplace
}
package(){
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${_pkgname}-${_pkgver}"
python setup.py build_ext install --root=$pkgdir
}
check(){
- cd "${srcdir}/${_pkgname}-${pkgver}"
+ cd "${_pkgname}-${_pkgver}"
python setup.py test
}
# vim:ts=2:sw=2:et:
diff --git a/cython3.patch b/cython3.patch
new file mode 100644
index 000000000000..97a02f28b2bb
--- /dev/null
+++ b/cython3.patch
@@ -0,0 +1,45 @@
+From eda64b553dc82d9ac0fae6a18c0991972aa3cea6 Mon Sep 17 00:00:00 2001
+From: GILIYAR RADHAKRISHNA Chaithya <cg260486@is247382.intra.cea.fr>
+Date: Fri, 5 Jan 2024 12:04:37 +0100
+Subject: [PATCH] Fixes in codes
+
+---
+ pynfft/nfft.pyx | 2 +-
+ setup.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pynfft/nfft.pyx b/pynfft/nfft.pyx
+index a6c697c..d3a1001 100644
+--- a/pynfft/nfft.pyx
++++ b/pynfft/nfft.pyx
+@@ -34,7 +34,7 @@ np.import_array()
+ fftw_init_threads()
+
+ # register cleanup callbacks
+-cdef void _cleanup():
++cdef void _cleanup() noexcept:
+ fftw_cleanup()
+ fftw_cleanup_threads()
+
+diff --git a/setup.py b/setup.py
+index 5bac118..5ec72bb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -86,7 +86,7 @@ def get_cython_extensions():
+ **common_extension_args
+ )
+ )
+- return cythonize(ext_modules)
++ return cythonize(ext_modules, language_level=2)
+
+
+ # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
+@@ -179,7 +179,7 @@ def run(self):
+ ]
+
+ MAJOR = 1
+-MINOR = 3
++MINOR = 4
+ MICRO = 2
+ ISRELEASED = True
+ VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)