From 46edafddf7c12483267687f8bd6b7416208bd522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ne=C4=8Dada?= Date: Wed, 27 Feb 2019 10:25:24 +0200 Subject: [PATCH] Restoring the original functionality of zJn with new scipy. Former-commit-id: ad4f96885390387cb74c36a7b08a58094e3d62e5 --- qpms/qpms_p.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qpms/qpms_p.py b/qpms/qpms_p.py index 5eb455e..d0fc5aa 100644 --- a/qpms/qpms_p.py +++ b/qpms/qpms_p.py @@ -289,7 +289,7 @@ _sph_zn = [_sph_zn_1,_sph_zn_2,_sph_zn_3,_sph_zn_4] # computes bessel/hankel functions for orders from 0 up to n; #@jit def zJn(n, z, J=1): - return (_sph_zn[J-1](n=n,z=z,derivative=False), _sph_zn[J-1](n=n,z=z,derivative=True)) + return (_sph_zn[J-1](n=np.arange(n+1),z=z,derivative=False), _sph_zn[J-1](n=np.arange(n+1),z=z,derivative=True)) diff --git a/setup.py b/setup.py index 06c9172..cec9cf3 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ setup(name='qpms', version = "0.2.994", packages=['qpms'], setup_requires=['cython>0.28'], - install_requires=['cython>=0.21','quaternion','spherical_functions','scipy>=0.14.0' + install_requires=['cython>=0.21','quaternion','spherical_functions','scipy>=0.18.0' #'py_gmm' # no longer needed ], # TODO implement https://stackoverflow.com/questions/17366784/setuptools-unable-to-use-link-from-dependency-links and update README.md accordingly