Apply fix for deprecated import in Numba.

3 files changed, 45 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2abd0b03015e..2408f578c7fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-numpy-quaternion
 	pkgdesc = Add built-in support for quaternions to NumPy
 	pkgver = 2020.4.21.14.53.58
-	pkgrel = 1
+	pkgrel = 2
 	url = https://quaternion.readthedocs.io/
 	arch = x86_64
 	license = MIT
@@ -11,7 +11,9 @@ pkgbase = python-numpy-quaternion
 	depends = python-scipy
 	optdepends = python-numba: speedup of numerical functions
 	source = https://files.pythonhosted.org/packages/source/n/numpy-quaternion/numpy-quaternion-2020.4.21.14.53.58.tar.gz
+	source = fix_numba_wrapper.patch
 	sha256sums = 4027fda144389be042d55076cdb77e2502eb9418ba7006529455a18d3e4feb6c
+	sha256sums = 1bac9fb70b55a287129b4b2c580749307030dcdcb7eb7281ed9c17f2ed38161b
 
 pkgname = python-numpy-quaternion
 
diff --git a/PKGBUILD b/PKGBUILD
index ecb633dbb7eb..ceef8ed575be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=python-numpy-quaternion
 pkgver=2020.4.21.14.53.58
-pkgrel=1
+pkgrel=2
 pkgdesc="Add built-in support for quaternions to NumPy"
 url="https://quaternion.readthedocs.io/"
 arch=('x86_64')
@@ -15,11 +15,18 @@ makedepends=('python-setuptools')
 checkdepends=('python-pytest')
 source=(
   "https://files.pythonhosted.org/packages/source/n/numpy-quaternion/numpy-quaternion-$pkgver.tar.gz"
+  'fix_numba_wrapper.patch'
 )
 sha256sums=(
   '4027fda144389be042d55076cdb77e2502eb9418ba7006529455a18d3e4feb6c'
+  '1bac9fb70b55a287129b4b2c580749307030dcdcb7eb7281ed9c17f2ed38161b'
 )
 
+prepare() {
+    cd "numpy-quaternion-$pkgver"
+    patch -p1 -i "$srcdir/fix_numba_wrapper.patch"
+}
+
 build() {
     cd "numpy-quaternion-$pkgver"
     package_version="$pkgver" python setup.py build
diff --git a/fix_numba_wrapper.patch b/fix_numba_wrapper.patch
new file mode 100644
index 000000000000..a070eccdd6b6
--- /dev/null
+++ b/fix_numba_wrapper.patch
@@ -0,0 +1,34 @@
+diff --git a/numba_wrapper.py b/numba_wrapper.py
+index 5074633..008ae41 100644
+--- a/numba_wrapper.py
++++ b/numba_wrapper.py
+@@ -2,18 +2,16 @@
+ # See LICENSE file for details: <https://github.com/moble/quaternion/blob/master/LICENSE>
+ 
+ from __future__ import division, print_function, absolute_import
++import sys
++
++IS_PY3 = (sys.version_info[:2] >= (3, 0))
+ 
+ ## Allow the code to function without numba, but discourage it
+ try:
+     from numba import njit, jit, vectorize, int64, float64, complex128
+-    try:
+-        from numba.utils import IS_PY3
+-    except ModuleNotFoundError:
+-        IS_PY3 = (sys.version_info[:2] >= (3, 0))
+     GOT_NUMBA = True
+ except ImportError:
+     import warnings
+-    import sys
+     warning_text = \
+         "\n\n" + "!" * 53 + "\n" + \
+         "Could not import from numba, which means that some\n" + \
+@@ -31,7 +29,6 @@ except ImportError:
+     int64 = int
+     float64 = float
+     complex128 = complex
+-    IS_PY3 = (sys.version_info[:2] >= (3, 0))
+     GOT_NUMBA = False
+ 
+ if IS_PY3: