Run tests in Python 3.6 by default

.nengobones.yml

@@ -441,7 +441,7 @@ docs_conf_py:
     - import nengo
 
 travis_yml:
-  python: 3.5.2
+  python: 3.6
   global_vars:
     NENGO_VERSION: nengo[tests]
     NENGO_DL_VERSION: nengo-dl
@@ -458,6 +458,7 @@ travis_yml:
         NENGO_VERSION: git+https://github.com/nengo/nengo.git#egg=nengo[tests]
         NENGO_DL_VERSION: git+https://github.com/nengo/nengo-dl.git#egg=nengo-dl
     - script: hardware
+      python: 3.5.2  # nxsdk requires 3.5.2
       env:
         NENGO_VERSION: git+https://github.com/nengo/nengo.git#egg=nengo[tests]
         NENGO_DL_VERSION: git+https://github.com/nengo/nengo-dl.git#egg=nengo-dl
@@ -478,7 +479,7 @@ ci_scripts:
       - $NENGO_VERSION
       - $NENGO_DL_VERSION
       - jupyter
-      - numpy
+      - numpy>=1.14  # avoid the default-installed 1.13 on TravisCI
     coverage: true
     nengo_tests: true
   - template: static

.travis.yml

@@ -1,7 +1,7 @@
 # Automatically generated by nengo-bones, do not edit this file directly
 
 language: python
-python: 3.5.2
+python: 3.6
 notifications:
   email:
     on_success: change
@@ -43,6 +43,7 @@ jobs:
       NENGO_DL_VERSION="git+https://github.com/nengo/nengo-dl.git#egg=nengo-dl"
       NXSDK_VERSION="0.8.5"
       SCRIPT="hardware"
+    python: 3.5.2
   -
     env:
       NENGO_VERSION="git+https://github.com/nengo/nengo.git#egg=nengo[tests]"

CHANGES.rst

@@ -43,6 +43,12 @@ Release history
   TensorFlow version to 2.0).
   (`#259 <https://github.com/nengo/nengo-loihi/pull/259>`__)
 
+**Fixed**
+
+- Fixed a bug in which ``scipy`` was not imported properly in some situations.
+  (`#252 <https://github.com/nengo/nengo-loihi/issues/252>`__,
+  `#258 <https://github.com/nengo/nengo-loihi/pull/258>`__)
+
 0.8.0 (June 23, 2019)
 =====================
 

nengo_loihi/block.py

@@ -3,7 +3,7 @@
 from nengo.exceptions import BuildError
 
 import numpy as np
-import scipy
+import scipy.sparse
 
 from nengo_loihi.nxsdk_obfuscation import d
 

nengo_loihi/builder/connection.py

@@ -15,7 +15,7 @@
 from nengo.exceptions import BuildError, ValidationError
 from nengo.solvers import NoSolver, Solver
 import numpy as np
-import scipy
+import scipy.sparse
 
 from nengo_loihi.block import Axon, LoihiBlock, Probe, Synapse
 from nengo_loihi.builder.builder import Builder

nengo_loihi/builder/sparse_matrix.py

@@ -1,5 +1,5 @@
 import numpy as np
-import scipy
+import scipy.sparse
 
 
 def expand_matrix(matrix, shape):

nengo_loihi/builder/tests/test_sparse_matrix.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pytest
-import scipy
+import scipy.sparse
 
 from nengo_loihi.builder.sparse_matrix import (
     expand_matrix,

nengo_loihi/compat.py

@@ -3,7 +3,7 @@
 
 import nengo
 import numpy as np
-import scipy
+import scipy.sparse
 
 logger = logging.getLogger(__name__)
 

nengo_loihi/tests/test_connection.py

@@ -3,7 +3,7 @@
 from nengo.utils.matplotlib import rasterplot
 import numpy as np
 import pytest
-import scipy
+import scipy.sparse
 
 from nengo_loihi.builder import connection
 from nengo_loihi.compat import nengo_transforms