Revert "requiring scipy 0.15 now"

This reverts commit 78a8fbb.

Author: Steven Diamond

.travis.yml

@@ -4,16 +4,16 @@ virtualenv:
 env:
   matrix:
     - DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_ATLAS="true"
-      NUMPY_VERSION="1.9" SCIPY_VERSION="0.15"
+      NUMPY_VERSION="1.8" SCIPY_VERSION="0.14"
       COVERAGE="true" INSTALL_GLPK="true"
     - DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_ATLAS="true"
-      NUMPY_VERSION="1.9" SCIPY_VERSION="0.15"
+      NUMPY_VERSION="1.8" SCIPY_VERSION="0.14"
       COVERAGE="true" INSTALL_GLPK="false"
     - DISTRIB="conda" PYTHON_VERSION="3.4" INSTALL_ATLAS="true"
-      NUMPY_VERSION="1.9" SCIPY_VERSION="0.15"
+      NUMPY_VERSION="1.8" SCIPY_VERSION="0.14"
       COVERAGE="true" INSTALL_GLPK="true"
     - DISTRIB="conda" PYTHON_VERSION="3.4" INSTALL_ATLAS="true"
-      NUMPY_VERSION="1.9" SCIPY_VERSION="0.15"
+      NUMPY_VERSION="1.8" SCIPY_VERSION="0.14"
       COVERAGE="true" INSTALL_GLPK="false"
 install: source continuous_integration/install.sh
 script: bash continuous_integration/test_script.sh

CHANGELOG.md

@@ -16,7 +16,6 @@ Version 1.0 (targets)
 * TODO replace norm with vecnorm and norm (for matrices) (see how numpy does it).
 * TODO separate constant and linear components of expressions so potentially can cache matrix factorizations.
 * TODO add logistic_loss
-* TODO bitshift <<, >> for PSD inequality.
 
 Version 0.2.21 (next release)
 -----------------------------

setup.py

@@ -31,7 +31,7 @@
                       "ecos >= 1.1.1",
                       "scs >= 1.0.6",
                       "toolz",
-                      "numpy >= 1.9",
-                      "scipy >= 0.15"],
+                      "numpy >= 1.8",
+                      "scipy >= 0.13"],
     use_2to3=True,
 )