From fddae5676597f62758627aeb74979c556185aaad Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 26 Nov 2014 13:34:02 -0600
Subject: [PATCH] Ditch 2to3
---
setup.cfg | 2 +-
setup.py | 13 +++----------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/setup.cfg b/setup.cfg
index eca7b43fd..6faef2e65 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 08c179a47..c66b3042a 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})
+ )
--
GitLab