From 858e6e0a6eab91a6893f07ad77bf383e1b09d57e Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Mon, 15 Oct 2018 14:44:39 +0200 Subject: [PATCH] Re-enable scipy.interpolate._interpolate --- ...e_modules_global_cpp_namespace_issue.patch | 21 +------------------ test/test_scipy.py | 3 +-- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/packages/scipy/patches/disable_modules_global_cpp_namespace_issue.patch b/packages/scipy/patches/disable_modules_global_cpp_namespace_issue.patch index af7baa5fe..49722d313 100644 --- a/packages/scipy/patches/disable_modules_global_cpp_namespace_issue.patch +++ b/packages/scipy/patches/disable_modules_global_cpp_namespace_issue.patch @@ -1,28 +1,9 @@ -commit 15e9f01458eec8cf9fc43de6646ee75cfa361859 +commit 0da8a50bd566ee7810ed1888112cc9c9a1b27d9e Author: Roman Yurchak Date: Wed Oct 10 14:12:22 2018 +0200 Remove modules with global C++ namespace issue -diff --git a/scipy/interpolate/setup.py b/scipy/interpolate/setup.py -index b42d3345c..2c8279403 100755 ---- a/scipy/interpolate/setup.py -+++ b/scipy/interpolate/setup.py -@@ -35,10 +35,10 @@ def configuration(parent_package='',top_path=None): - depends=fitpack_src, - ) - -- config.add_extension('_interpolate', -- sources=['src/_interpolate.cpp'], -- include_dirs=['src'], -- depends=['src/interpolate.h']) -+ #config.add_extension('_interpolate', -+ # sources=['src/_interpolate.cpp'], -+ # include_dirs=['src'], -+ # depends=['src/interpolate.h']) - - config.add_data_dir('tests') - diff --git a/scipy/sparse/setup.py b/scipy/sparse/setup.py index ecf8ae5c6..27fd128c3 100755 --- a/scipy/sparse/setup.py diff --git a/test/test_scipy.py b/test/test_scipy.py index 06844a85c..da1467da7 100644 --- a/test/test_scipy.py +++ b/test/test_scipy.py @@ -19,7 +19,7 @@ def test_scipy_import(selenium_standalone): """) # supported modules - for module in ['constants', 'fftpack']: + for module in ['constants', 'fftpack', 'odr']: selenium.run(f"import scipy.{module}") # not yet built modules @@ -30,7 +30,6 @@ def test_scipy_import(selenium_standalone): 'interpolate', # needs linalg 'linalg', 'misc', # needs special - 'odrpack', 'signal', # needs special 'ndimage', # needs special 'stats', # need special