diff --git a/setup.cfg b/setup.cfg index eca7b43fd4a3ea8f7a21eb2a4fbdb1aab0cd4fa1..6faef2e65abe138f9ab22c94452c43be0e52c075 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,3 @@ [flake8] -ignore = E126,E127,E128,E123,E226,E241,E242 +ignore = E126,E127,E128,E123,E226,E241,E242,E265 max-line-length=85 diff --git a/setup.py b/setup.py index 08c179a471bc7e173d230990e8f98c16dbb17b57..c66b3042a414231358eb645256e78c4b1c5c6f56 100644 --- a/setup.py +++ b/setup.py @@ -3,12 +3,6 @@ from setuptools import setup -try: - from distutils.command.build_py import build_py_2to3 as build_py -except ImportError: - # 2.x - from distutils.command.build_py import build_py - ver_dic = {} version_file = open("loopy/version.py") try: @@ -43,7 +37,8 @@ setup(name="loo.py", "pyopencl>=2014.1", "pymbolic>=2014.1.1", "cgen>=2013.1.2", - "islpy>=2014.2" + "islpy>=2014.2", + "six" ], author="Andreas Kloeckner", @@ -56,6 +51,4 @@ setup(name="loo.py", "loopy.kernel", "loopy.library", ], - - # 2to3 invocation - cmdclass={'build_py': build_py}) + )