From 929ceadda129090e260ec693178b992cd02da7bb Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Fri, 25 Oct 2013 14:05:02 -0400 Subject: [PATCH] Switched setup.py to setuptools. --- extras/Makefile | 2 +- setup.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/extras/Makefile b/extras/Makefile index ff14f404e2..66efd0d451 100644 --- a/extras/Makefile +++ b/extras/Makefile @@ -4,6 +4,6 @@ sdist: python setup.py sdist bdist_wheel: - python -c "import setuptools;__file__='setup.py';exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))" bdist_wheel + python setup.py bdist_wheel .PHONY : sdist bdist_wheel diff --git a/setup.py b/setup.py index 6278afa116..a663a13691 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ import os import sys -from distutils.core import setup +from setuptools import setup from distutils.sysconfig import get_python_lib # Warn if we are installing over top of an existing installation. This can @@ -91,7 +91,10 @@ setup( license='BSD', packages=packages, package_data=package_data, - scripts=['django/bin/django-admin.py'], + entry_points={'console_scripts': [ + 'django-admin = django.core.management:execute_from_command_line', + ]}, + zip_safe=False, classifiers=[ 'Development Status :: 3 - Alpha', 'Environment :: Web Environment', @@ -113,6 +116,7 @@ setup( ], ) + if overlay_warning: sys.stderr.write("""