diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | SetupTools.py | 27 |
2 files changed, 8 insertions, 21 deletions
@@ -1,6 +1,8 @@ 2.2.2 (Unreleased) - Prevent _namemapper.c from segfaulting when PyImport_ImportModule fails for some reason (Bogdano Arendartchuk <debogdano@gmail.com>) + - Removal of the contrib/markdown module (in favor of a setuptools dependency) + - Default setup.py to use setuptools by default, failing that, fall back to distutils 2.2.1 (June 1st, 2009) - 0000020: [Templates] Builtin support for using Cheetah with Django (rtyler) diff --git a/SetupTools.py b/SetupTools.py index d31853a..d6d48dd 100644 --- a/SetupTools.py +++ b/SetupTools.py @@ -1,15 +1,4 @@ #!/usr/bin/env python -# $Id: SetupTools.py,v 1.9 2007/11/03 19:44:38 tavis_rudd Exp $ -"""Some tools for extending and working with distutils - -CREDITS: This module borrows code and ideas from M.A. Lemburg's excellent setup -tools for the mxBase package. - -""" - -__author__ = "Tavis Rudd <tavis@damnsimple.com>" -__version__ = "$Revision: 1.9 $"[11:-2] - import os from os import listdir import os.path @@ -20,16 +9,12 @@ import string import traceback from distutils.core import setup -if 'CHEETAH_USE_SETUPTOOLS' in os.environ: - # @@TR: Please note that this is for testing purposes only! PEAK setuptools - # is not required or recommended for installing Cheetah. Downstream - # package managers (linux distros, etc.) should *not* enable this. - try: - # use http://peak.telecommunity.com/DevCenter/setuptools if it's installed - # requires Py >=2.3 - from setuptools import setup - except ImportError: - from distutils.core import setup +try: + # use http://peak.telecommunity.com/DevCenter/setuptools if it's installed + # requires Py >=2.3 + from setuptools import setup +except ImportError: + from distutils.core import setup from distutils.core import Command from distutils.command.install_data import install_data |