Mercurial > kallithea

changeset 6033:a922e91a4f02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setup: drop ez_setup It should no longer be necessary - everybody should have setuptools and use pip. If not, just use ez to install setuptools and pip.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 28 Jul 2016 16:28:34 +0200
parents 94db428caa4e
children 42976e0d4e2f
files setup.py
diffstat 1 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Thu Jul 28 16:28:34 2016 +0200
+++ b/setup.py	Thu Jul 28 16:28:34 2016 +0200
@@ -4,7 +4,7 @@
 import sys
 import platform
 
-if sys.version_info < (2, 6):
+if sys.version_info < (2, 6) or sys.version_info >= (3,):
     raise Exception('Kallithea requires python 2.6 or 2.7')
 
 
@@ -109,12 +109,7 @@
     )
     long_description = description
 
-try:
-    from setuptools import setup, find_packages
-except ImportError:
-    from ez_setup import use_setuptools
-    use_setuptools()
-    from setuptools import setup, find_packages
+import setuptools
 
 # monkey patch setuptools to use distutils owner/group functionality
 from setuptools.command import sdist
@@ -125,10 +120,9 @@
         self.owner = self.group = 'root'
 sdist.sdist = sdist_new
 
-# packages
-packages = find_packages(exclude=['ez_setup'])
+packages = setuptools.find_packages(exclude=['ez_setup'])
 
-setup(
+setuptools.setup(
     name='Kallithea',
     version=__version__,
     description=description,