merge with raichoo/pygments-main (pull request #210)

1 files changed, 19 insertions, 19 deletions

diff --git a/setup.py b/setup.py
index 17bbf814..a0b2e90b 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@
     .. _Pygments tip:
        http://bitbucket.org/birkenfeld/pygments-main/get/default.zip#egg=Pygments-dev
 
-    :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
+    :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -31,21 +31,22 @@ try:
     from setuptools import setup, find_packages
     have_setuptools = True
 except ImportError:
-    from distutils.core import setup
-    def find_packages():
-        return [
-            'pygments',
-            'pygments.lexers',
-            'pygments.formatters',
-            'pygments.styles',
-            'pygments.filters',
-        ]
-    have_setuptools = False
-
-try:
-    from distutils.command.build_py import build_py_2to3 as build_py
-except ImportError:
-    from distutils.command.build_py import build_py
+    try:
+        import ez_setup
+        ez_setup.use_setuptools()
+        from setuptools import setup, find_packages
+        have_setuptools = True
+    except ImportError:
+        from distutils.core import setup
+        def find_packages(*args, **kwargs):
+            return [
+                'pygments',
+                'pygments.lexers',
+                'pygments.formatters',
+                'pygments.styles',
+                'pygments.filters',
+            ]
+        have_setuptools = False
 
 if have_setuptools:
     add_keywords = dict(
@@ -60,7 +61,7 @@ else:
 
 setup(
     name = 'Pygments',
-    version = '1.6',
+    version = '2.0pre',
     url = 'http://pygments.org/',
     license = 'BSD License',
     author = 'Georg Brandl',
@@ -68,7 +69,7 @@ setup(
     description = 'Pygments is a syntax highlighting package written in Python.',
     long_description = __doc__,
     keywords = 'syntax highlighting',
-    packages = find_packages(),
+    packages = find_packages(exclude=['ez_setup']),
     platforms = 'any',
     zip_safe = False,
     include_package_data = True,
@@ -85,6 +86,5 @@ setup(
         'Topic :: Text Processing :: Filters',
         'Topic :: Utilities',
     ],
-    cmdclass = {'build_py': build_py},
     **add_keywords
 )