Increase FuncCastEmulation NUM_PARAMS further

emsdk/patches/num_params.patch

@@ -7,7 +7,7 @@ index 013e9403..d95fc282 100644
  // to match when dynamically linking, and also dynamic linking is why we
  // can't just detect this automatically in the module we see.)
 -static const int NUM_PARAMS = 15;
-+static const int NUM_PARAMS = 45;
++static const int NUM_PARAMS = 61;   // needed by scipy.odr._odrpack
 
  // Converts a value to the ABI type of i64.
  static Expression* toABI(Expression* value, Module* module) {

packages/scipy/meta.yaml

@@ -21,7 +21,6 @@ source:
     - patches/force_malloc.patch
     - patches/disable_scipy_stats_mvn.patch
     - patches/skip-fortran-fails-to-link.patch
-    - patches/disable_FuncCastEmulation_num_params.patch
 
 build:
   cflags: -I../../CLAPACK-WA/INCLUDE -Wno-implicit-function-declaration

packages/scipy/patches/disable_FuncCastEmulation_num_params.patch

-commit dbfb06104aa7f3f36737f394b66a76a29018d5e7
-Author: Roman Yurchak <rth.yurchak@pm.me>
-Date:   Fri Oct 12 10:36:48 2018 +0200
-
-    Disable F2C function that need larger FuncCastEmulation::NUM_PARAMS
-    
-    scipy/interpolate/_fitpack seems to require NUM_PARAMS
-    43 then 45 then 47 (each requiring to rebuild emsdk), so disabling this
-    for now.
-    scipy/ord/_odrpack requires NUM_PARAMS 57
-
-diff --git a/scipy/interpolate/setup.py b/scipy/interpolate/setup.py
-index 2c8279403..9934376e8 100755
---- a/scipy/interpolate/setup.py
-+++ b/scipy/interpolate/setup.py
-@@ -22,18 +22,18 @@ def configuration(parent_package='',top_path=None):
-                          sources=['_ppoly.c'],
-                          **lapack_opt)
- 
--    config.add_extension('_fitpack',
--                         sources=['src/_fitpackmodule.c'],
--                         libraries=['fitpack'],
--                         depends=(['src/__fitpack.h','src/multipack.h']
--                                  + fitpack_src)
--                         )
--
--    config.add_extension('dfitpack',
--                         sources=['src/fitpack.pyf'],
--                         libraries=['fitpack'],
--                         depends=fitpack_src,
--                         )
-+    #config.add_extension('_fitpack',
-+    #                     sources=['src/_fitpackmodule.c'],
-+    #                     libraries=['fitpack'],
-+    #                     depends=(['src/__fitpack.h','src/multipack.h']
-+    #                              + fitpack_src)
-+    #                     )
-+
-+    #config.add_extension('dfitpack',
-+    #                     sources=['src/fitpack.pyf'],
-+    #                     libraries=['fitpack'],
-+    #                     depends=fitpack_src,
-+    #                     )
- 
-     #config.add_extension('_interpolate',
-     #                     sources=['src/_interpolate.cpp'],
-diff --git a/scipy/odr/setup.py b/scipy/odr/setup.py
-index 9974dfac6..d7560896f 100644
---- a/scipy/odr/setup.py
-+++ b/scipy/odr/setup.py
-@@ -22,18 +22,18 @@ def configuration(parent_package='', top_path=None):
-         libodr_files.append('d_lpkbls.f')
- 
-     odrpack_src = [join('odrpack', x) for x in libodr_files]
--    config.add_library('odrpack', sources=odrpack_src)
-+    #config.add_library('odrpack', sources=odrpack_src)
- 
-     sources = ['__odrpack.c']
-     libraries = ['odrpack'] + blas_info.pop('libraries', [])
-     include_dirs = ['.'] + blas_info.pop('include_dirs', [])
--    config.add_extension('__odrpack',
--        sources=sources,
--        libraries=libraries,
--        include_dirs=include_dirs,
--        depends=(['odrpack.h'] + odrpack_src),
--        **blas_info
--    )
-+    #config.add_extension('__odrpack',
-+    #    sources=sources,
-+    #    libraries=libraries,
-+    #    include_dirs=include_dirs,
-+    #    depends=(['odrpack.h'] + odrpack_src),
-+    #    **blas_info
-+    #)
- 
-     config.add_data_dir('tests')
-     return config

test/conftest.py

@@ -17,7 +17,6 @@ TEST_PATH = pathlib.Path(__file__).parents[0].resolve()
 BUILD_PATH = TEST_PATH / '..' / 'build'
 
 sys.path.append(str(TEST_PATH / '..'))
-print(sys.path)
 
 from pyodide_build._fixes import _selenium_is_connectable  # noqa: E402
 import selenium.webdriver.common.utils  # noqa: E402