Merge branch 'master' into debian

This commit is contained in:
Stefan van der Walt
2013-10-05 13:18:18 +02:00
314 changed files with 20136 additions and 6668 deletions
+2 -5
View File
@@ -21,7 +21,7 @@ VERSION = '0.8.1'
PYTHON_VERSION = (2, 5)
DEPENDENCIES = {
'numpy': (1, 6),
'Cython': (0, 15),
'Cython': (0, 17),
}
@@ -30,10 +30,7 @@ import sys
import re
import setuptools
from numpy.distutils.core import setup
try:
from distutils.command.build_py import build_py_2to3 as build_py
except ImportError:
from distutils.command.build_py import build_py
from distutils.command.build_py import build_py
def configuration(parent_package='', top_path=None):