Merge branch 'testing'

README.rst

@@ -17,7 +17,7 @@ The implementation has an intuitive syntax for entering problems and it scales f
 
 Dependencies
 ============
-The implementation requires `SymPy <http://sympy.org/>`_ and `Numpy <http://www.numpy.org/>`_. The code is compatible with both Python 2 and 3. While the default CPython interpreter is sufficient for small to medium-scale problems, execution time becomes excessive for larger problems. The code is compatible with Pypy. Using it yields a 10-20x speedup. If you use Pypy, you will need the `Pypy fork of Numpy <https://bitbucket.org/pypy/numpy/>`_.
+The implementation requires `SymPy <http://sympy.org/>`_ and `Numpy <http://www.numpy.org/>`_. The code is compatible with both Python 2 and 3. The code is compatible with Pypy>=5.10. Using it yields a 10-20x speedup.
 
 By default, Ncpol2sdpa does not require a solver, but then it will not be able to solve a generated relaxation either. Install any supported solver and it will be detected automatically.
 

doc/source/download.rst

@@ -5,9 +5,7 @@ The package is available in the `Python Package Index <https://pypi.python.org/p
 
 Dependencies
 ============
-The implementation requires `SymPy <http://sympy.org/>`_ and `Numpy <http://www.numpy.org/>`_. The code is compatible with both Python 2 and 3, but using version 3 incurs a major decrease in performance.
-
-While the default CPython interpreter is sufficient for small to medium-scale problems, execution time becomes excessive for larger problems. The code is compatible with Pypy. Using it yields a 10-20x speedup. If you use Pypy, you will need the `Pypy fork of Numpy <https://bitbucket.org/pypy/numpy>`_.
+The implementation requires `SymPy <http://sympy.org/>`_ and `Numpy <http://www.numpy.org/>`_. The code is compatible with both Python 2 and 3. The code is compatible with Pypy. Using it yields a 10-20x speedup.
 
 By default, Ncpol2sdpa does not require a solver, but then it will not be able to solve a generated relaxation either. Install any supported solver and it will be detected automatically.
 

ncpol2sdpa/cvxpy_utils.py

@@ -7,10 +7,7 @@
 
 from __future__ import division, print_function
 import numpy as np
-try:
-    from scipy.sparse import lil_matrix
-except ImportError:
-    from .sparse_utils import lil_matrix
+from scipy.sparse import lil_matrix
 from .sdpa_utils import convert_row_to_sdpa_index
 
 

ncpol2sdpa/faacets_relaxation.py

@@ -9,10 +9,7 @@
 from math import copysign
 import numpy as np
 import os
-try:
-    from scipy.sparse import lil_matrix
-except ImportError:
-    from .sparse_utils import lil_matrix
+from scipy.sparse import lil_matrix
 from .sdp_relaxation import Relaxation
 
 

ncpol2sdpa/nc_utils.py

@@ -10,10 +10,7 @@
 from __future__ import division, print_function
 from sympy import adjoint, conjugate, S, Symbol, Pow, Number, expand, I
 from sympy.physics.quantum import HermitianOperator, Operator
-try:
-    from scipy.sparse import lil_matrix
-except ImportError:
-    from .sparse_utils import lil_matrix
+from scipy.sparse import lil_matrix
 
 
 def flatten(lol):

ncpol2sdpa/sdp_relaxation.py

@@ -11,6 +11,7 @@
 import sys
 from functools import partial
 import numpy as np
+from scipy.sparse import lil_matrix
 from sympy import S, Expr, Add
 import time
 
@@ -22,10 +23,6 @@
     from multiprocessing import Pool, cpu_count
 except ImportError:
     pass
-try:
-    from scipy.sparse import lil_matrix
-except ImportError:
-    from .sparse_utils import lil_matrix
 try:
     from IPython.core.display import clear_output
     have_ipython = True