Use scipy 0.17.1

.circleci/config.yml

@@ -16,6 +16,12 @@ jobs:
           command: |
             make lint
 
+      - run:
+           name: dependencies
+           command: |
+	     # Download BLAS/LAPACK 
+             git clone https://github.com/adrianbg/CLAPACK-WA.git packages/scipy/CLAPACK-WA
+
       - restore_cache:
           keys:
           - v1-emsdk-{{ checksum "emsdk/Makefile" }}-v11-

Makefile

@@ -208,6 +208,8 @@ $(LZ4LIB):
 $(SIX_LIBS): $(CPYTHONLIB)
 	make -C six
 
+$(LAPACK): $(CPYTHONLIB)
+	emmake make -C packages/scipy/CLAPACK-WA
 
 $(CLAPACK): $(CPYTHONLIB)
 	make -C CLAPACK

packages/Makefile

 PYODIDE_ROOT=$(abspath ..)
 include ../Makefile.envs
 
-all:
+all: deps
 	../bin/pyodide buildall . ../build \
 		--ldflags="$(SIDE_LDFLAGS)" --host=$(HOSTPYTHONROOT) --target=$(TARGETPYTHONROOT)
+deps:
+	# Temporary workaround to install build dependencies
+	$(HOSTPYTHON) -m pip install Cython Tempita
 
 clean:
 	rm -rf ./*/build

packages/scipy/meta.yaml

 package:
   name: scipy
-  version: 1.1.0
+  version: 0.17.1
 
 source:
-  url: https://files.pythonhosted.org/packages/07/76/7e844757b9f3bf5ab9f951ccd3e4a8eed91ab8720b0aac8c2adcc2fdae9f/scipy-1.1.0.tar.gz
-  sha256: 878352408424dffaa695ffedf2f9f92844e116686923ed9aa8626fc30d32cfd1
+  # We can't use the version from PyPi as it includes Cythonized files
+  # generated with an older Cython that does not support Python 3.7
+  # This requires,
+  #    pip install Cython Tempita
+  # on the host for the build
+  url: https://github.com/scipy/scipy/archive/v0.17.1.tar.gz
+  sha256: bf22383d9e2526ffdc53a6c7d3d66dab45a86291ed35d8e281bd1a5d2c34187b
+
+  patches:
+    - patches/disable_modules_with_blas.patch
+    - patches/fix-build-gcc5-a80460.patch
 
 build:
-  cflags: -ICLAPACK-WA/F2CLIBS/libf2c/ -Wno-implicit-function-declaration
+  cflags: -I../../CLAPACK-WA/F2CLIBS/libf2c/ -Wno-implicit-function-declaration
   cxxflags:
 
 requirements:

packages/scipy/patches/fix-build-gcc5-a80460.patch

+commit a80460f1b45035d34575866e6394107396ac62e2
+Author: Michael Danilov <mike402@users.noreply.github.com>
+Date:   Thu Apr 20 18:08:39 2017 +0200
+
+    Fix build with GCC5.
+
+diff --git a/scipy/odr/odrpack/d_lpkbls.f b/scipy/odr/odrpack/d_lpkbls.f
+index 324b7a8a2..1e6624d63 100644
+--- a/scipy/odr/odrpack/d_lpkbls.f
++++ b/scipy/odr/odrpack/d_lpkbls.f
+@@ -136,8 +136,8 @@ C***FIRST EXECUTABLE STATEMENT  DAXPY
+ 
+ 
+       IF(N.LE.0.OR.DA.EQ.0.D0) RETURN
+-      IF (INCX.EQ.INCY) IF(INCX.lt.1) GOTO 5
+-      IF (INCX.EQ.INCY) IF(INCX.eq.1) GOTO 20
++      IF (INCX.EQ.INCY .AND. INCX.lt.1) GOTO 5
++      IF (INCX.EQ.INCY .AND. INCX.eq.1) GOTO 20
+       GOTO 60
+     5 CONTINUE
+ 
+@@ -483,8 +483,8 @@ C***FIRST EXECUTABLE STATEMENT  DCOPY
+ 
+ 
+       IF(N.LE.0)RETURN
+-      IF (INCX.EQ.INCY) IF(INCX.lt.1) GOTO 5
+-      IF (INCX.EQ.INCY) IF(INCX.eq.1) GOTO 20
++      IF (INCX.EQ.INCY .AND. INCX.lt.1) GOTO 5
++      IF (INCX.EQ.INCY .AND. INCX.eq.1) GOTO 20
+       GOTO 60
+     5 CONTINUE
+ 
+@@ -589,8 +589,8 @@ C***FIRST EXECUTABLE STATEMENT  DDOT
+ 
+       DDOT = 0.D0
+       IF(N.LE.0)RETURN
+-      IF (INCX.EQ.INCY) IF(INCX.lt.1) GOTO 5
+-      IF (INCX.EQ.INCY) IF(INCX.eq.1) GOTO 20
++      IF (INCX.EQ.INCY .AND. INCX.lt.1) GOTO 5
++      IF (INCX.EQ.INCY .AND. INCX.eq.1) GOTO 20
+       GOTO 60
+     5 CONTINUE
+ 
+@@ -1772,8 +1772,8 @@ C***FIRST EXECUTABLE STATEMENT  DSWAP
+ 
+ 
+       IF(N.LE.0)RETURN
+-      IF (INCX.EQ.INCY) IF(INCX.lt.1) GOTO 5
+-      IF (INCX.EQ.INCY) IF(INCX.eq.1) GOTO 20
++      IF (INCX.EQ.INCY .AND. INCX.lt.1) GOTO 5
++      IF (INCX.EQ.INCY .AND. INCX.eq.1) GOTO 20
+       GOTO 60
+     5 CONTINUE
+