From 3a34effe342473a902e9a898c125150325562320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ne=C4=8Dada?= Date: Tue, 7 Jun 2022 06:07:08 +0300 Subject: [PATCH] Don't import qpms_p in __init__, remove scipy from install dependencies --- qpms/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qpms/__init__.py b/qpms/__init__.py index e7caea7..61ec6cd 100644 --- a/qpms/__init__.py +++ b/qpms/__init__.py @@ -24,7 +24,7 @@ from .cymaterials import MaterialInterpolator, EpsMu, LorentzDrudeModel, lorentz from .cycommon import dbgmsg_enable, dbgmsg_disable, dbgmsg_active, BesselType, VSWFType from .cywaves import vswf_single -from .qpms_p import * # maybe don't import automatically in the future (adds around 0.5 s delay) +#from .qpms_p import * # don't import automatically (adds around 0.5 s delay and depends on scipy) from .constants import * # legacy code which brutally slows down the whole package init: diff --git a/setup.py b/setup.py index 6291afd..3fb7b3b 100755 --- a/setup.py +++ b/setup.py @@ -161,7 +161,7 @@ setup(name='qpms', setup_requires=['cython>=0.28','numpy>=1.2','setuptools>=18.0'], install_requires=['cython>=0.28', #'quaternion','spherical_functions', - 'scipy>=0.18.0', 'sympy>=1.2', 'numpy>=1.2'], + 'sympy>=1.2', 'numpy>=1.2'], #dependency_links=['https://github.com/moble/quaternion/archive/v2.0.tar.gz','https://github.com/moble/spherical_functions/archive/master.zip'], ext_modules=cythonize([qpms_c, cywaves, cytranslations, cytmatrices, cycommon, cyquaternions, cybspec, cymaterials, cyewaldtest], include_path=['qpms', 'amos'], gdb_debug=True), cmdclass = {'build_ext': build_ext},