# HG changeset patch # User Mads Kiilerich # Date 1469716114 -7200 # Node ID a922e91a4f0212fa1e0766a7cbd304605cc0acdf # Parent 94db428caa4ee8309c4f254b3e37639ba113961e 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. diff -r 94db428caa4e -r a922e91a4f02 setup.py --- 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,