Skip to content

Commit ec29aeb

Browse files
Drop support for Python 2
1. Remove use of six, and remove mention of its requirement in setup 2. No longer attempt to infer MKL location from numpy's distutils Always require MKLROOT variable to be set.
1 parent 729b1f6 commit ec29aeb

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

setup.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,12 @@
6060

6161

6262
def get_extensions():
63-
try:
64-
from numpy.distutils.system_info import get_info
65-
mkl_info = get_info('mkl')
66-
except ImportError:
67-
mkl_root = os.environ['MKLROOT']
68-
mkl_info = {
69-
'include_dirs': [join(mkl_root, 'include')],
70-
'library_dirs': [join(mkl_root, 'lib'), join(mkl_root, 'lib', 'intel64')],
71-
'libraries': ['mkl_rt']
72-
}
63+
mkl_root = os.environ['MKLROOT']
64+
mkl_info = {
65+
'include_dirs': [join(mkl_root, 'include')],
66+
'library_dirs': [join(mkl_root, 'lib'), join(mkl_root, 'lib', 'intel64')],
67+
'libraries': ['mkl_rt']
68+
}
7369

7470
mkl_include_dirs = mkl_info.get('include_dirs', [])
7571
mkl_library_dirs = mkl_info.get('library_dirs', [])
@@ -99,7 +95,7 @@ def get_extensions():
9995
sources=['mkl/_mklinitmodule.c'],
10096
define_macros=defs,
10197
include_dirs=mkl_include_dirs,
102-
libraries=mkl_libraries,
98+
libraries=mkl_libraries + ["pthread"],
10399
library_dirs=mkl_library_dirs,
104100
extra_compile_args=[
105101
'-DNDEBUG'
@@ -155,7 +151,7 @@ def setup_package():
155151
test_suite='nose.collector',
156152
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
157153
setup_requires=['setuptools', 'cython'],
158-
install_requires=['six'],
154+
install_requires=[],
159155
packages=setuptools.find_packages(),
160156
ext_modules=get_extensions()
161157
)

0 commit comments

Comments
 (0)