Delete code only needed for numpy < 1.4

Author: njsmith

patsy/compat.py

@@ -12,20 +12,6 @@
 # To force use of the compat code, set this env var to a non-empty value:
 optional_dep_ok = not os.environ.get("PATSY_AVOID_OPTIONAL_DEPENDENCIES")
 
-# The *_indices functions were added in numpy 1.4
-import numpy as np
-if optional_dep_ok and hasattr(np, "triu_indices"):
-    from numpy import triu_indices
-    from numpy import tril_indices
-    from numpy import diag_indices
-else:
-    def triu_indices(n):
-        return np.triu(np.ones((n, n))).nonzero()
-    def tril_indices(n):
-        return np.tril(np.ones((n, n))).nonzero()
-    def diag_indices(n):
-        return (np.arange(n), np.arange(n))
-
 ##### Python standard library
 
 # The Python license requires that all derivative works contain a "brief

patsy/contrasts.py

@@ -14,7 +14,6 @@
 import six
 import numpy as np
 from patsy import PatsyError
-from patsy.compat import triu_indices, tril_indices, diag_indices
 from patsy.util import (repr_pretty_delegate, repr_pretty_impl,
                         safe_issubdtype,
                         no_pickling, assert_no_pickling)
@@ -479,8 +478,8 @@ def _helmert_contrast(self, levels):
 
         #r-like
         contr = np.zeros((n, n - 1))
-        contr[1:][diag_indices(n - 1)] = np.arange(1, n)
-        contr[triu_indices(n - 1)] = -1
+        contr[1:][np.diag_indices(n - 1)] = np.arange(1, n)
+        contr[np.triu_indices(n - 1)] = -1
         return contr
 
     def code_with_intercept(self, levels):
@@ -539,14 +538,14 @@ def _diff_contrast(self, levels):
         contr = np.zeros((nlevels, nlevels-1))
         int_range = np.arange(1, nlevels)
         upper_int = np.repeat(int_range, int_range)
-        row_i, col_i = triu_indices(nlevels-1)
+        row_i, col_i = np.triu_indices(nlevels-1)
         # we want to iterate down the columns not across the rows
         # it would be nice if the index functions had a row/col order arg
         col_order = np.argsort(col_i)
         contr[row_i[col_order],
               col_i[col_order]] = (upper_int-nlevels)/float(nlevels)
         lower_int = np.repeat(int_range, int_range[::-1])
-        row_i, col_i = tril_indices(nlevels-1)
+        row_i, col_i = np.tril_indices(nlevels-1)
         # we want to iterate down the columns not across the rows
         col_order = np.argsort(col_i)
         contr[row_i[col_order]+1, col_i[col_order]] = lower_int/float(nlevels)

setup.py

@@ -21,7 +21,12 @@
     license="2-clause BSD",
     packages=["patsy"],
     url="https://github.com/pydata/patsy",
-    install_requires=["six", "numpy"],
+    install_requires=[
+        "six",
+        # Possibly we need an even newer numpy than this, but we definitely
+        # need at least 1.4 for triu_indices
+        "numpy >= 1.4",
+    ],
     classifiers =
       [ "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",