Commit ead14ef3 authored by Roman Yurchak's avatar Roman Yurchak

More fixes

parent b495ead5
...@@ -139,7 +139,7 @@ clean: ...@@ -139,7 +139,7 @@ clean:
rm -fr src/*.bc rm -fr src/*.bc
make -C packages clean make -C packages clean
make -C six clean make -C six clean
make -C packages/scipy/CLAPACK-WA cleanall make -C CLAPACK-WA cleanall
echo "The Emsdk and CPython are not cleaned. cd into those directories to do so." echo "The Emsdk and CPython are not cleaned. cd into those directories to do so."
......
...@@ -32,3 +32,10 @@ build: ...@@ -32,3 +32,10 @@ build:
requirements: requirements:
run: run:
- numpy - numpy
test:
imports:
- scipy
- scipy.linalg
- scipy.special
- scipy.sparse
commit fcf3b0c9e36e81ed52a7ad4eab7497b2e8322759 commit d6740caa7400105a578ace74f8c25bbb3434178c
Author: Roman Yurchak <rth.yurchak@pm.me> Author: Roman Yurchak <rth.yurchak@pm.me>
Date: Wed Oct 10 14:47:12 2018 +0200 Date: Wed Oct 10 14:47:12 2018 +0200
Disable scipy.stats.mvn Disable scipy.stats.mvn
diff --git a/scipy/stats/kde.py b/scipy/stats/kde.py
index 7c702a038..8b0ab0254 100644
--- a/scipy/stats/kde.py
+++ b/scipy/stats/kde.py
@@ -32,7 +32,10 @@ import numpy as np
from numpy.random import randint, multivariate_normal
# Local imports.
-from . import mvn
+try:
+ from . import mvn
+except ImportError:
+ mvn = None
__all__ = ['gaussian_kde']
diff --git a/scipy/stats/setup.py b/scipy/stats/setup.py diff --git a/scipy/stats/setup.py b/scipy/stats/setup.py
index f1a02df4e..7366ec12d 100755 index f1a02df4e..7366ec12d 100755
--- a/scipy/stats/setup.py --- a/scipy/stats/setup.py
......
commit e85d4402a802160b13e49d34728f4358e5337848 commit c3affe05b5cb8d992cb7a955ff8b4c79452f3cc9
Author: Roman Yurchak <rth.yurchak@pm.me> Author: Roman Yurchak <rth.yurchak@pm.me>
Date: Thu Oct 11 17:10:36 2018 +0200 Date: Thu Oct 11 17:10:36 2018 +0200
...@@ -6,6 +6,34 @@ Date: Thu Oct 11 17:10:36 2018 +0200 ...@@ -6,6 +6,34 @@ Date: Thu Oct 11 17:10:36 2018 +0200
scipy.integrate.odepack scipy.integrate.odepack
diff --git a/scipy/integrate/_ode.py b/scipy/integrate/_ode.py
index de1064048..52bf3875a 100644
--- a/scipy/integrate/_ode.py
+++ b/scipy/integrate/_ode.py
@@ -89,10 +89,19 @@ import re
import warnings
from numpy import asarray, array, zeros, int32, isscalar, real, imag, vstack
-
-from . import vode as _vode
-from . import _dop
-from . import lsoda as _lsoda
+try:
+ from . import vode as _vode
+except ImportError:
+ _vode = None
+try:
+ from . import _dop
+except ImportError:
+ _dop = None
+
+try:
+ from . import lsoda as _lsoda
+except ImportError:
+ _lsoda = None
#------------------------------------------------------------------------------
diff --git a/scipy/integrate/odepack.py b/scipy/integrate/odepack.py diff --git a/scipy/integrate/odepack.py b/scipy/integrate/odepack.py
index eee2b04a3..17224f54e 100644 index eee2b04a3..17224f54e 100644
--- a/scipy/integrate/odepack.py --- a/scipy/integrate/odepack.py
......
...@@ -62,6 +62,7 @@ def test_scipy_linalg(selenium_standalone): ...@@ -62,6 +62,7 @@ def test_scipy_linalg(selenium_standalone):
@pytest.mark.skip @pytest.mark.skip
def test_built_so(selenium_standalone): def test_built_so(selenium_standalone):
selenium = selenium_standalone selenium = selenium_standalone
selenium.load_package("numpy")
selenium.load_package("scipy") selenium.load_package("scipy")
cmd = dedent(r""" cmd = dedent(r"""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment