[Matplotlib-checkins] SF.net SVN: matplotlib: [3536] trunk/matplotlib/setup.py

[<ed...@us...>]

Revision: 3536
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3536&view=rev
Author:   edin1
Date:     2007-07-16 01:01:21 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
Cleaned up setup.py.  Removed references to Python 2.2, distutils.

Modified Paths:
--------------
    trunk/matplotlib/setup.py

Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py	2007-07-16 07:47:32 UTC (rev 3535)
+++ trunk/matplotlib/setup.py	2007-07-16 08:01:21 UTC (rev 3536)
@@ -1,8 +1,4 @@
 """
-Note! If you are building for python2.2, you must comment out the
-py_modules line below and manually copy lib/pylab.py to
-site-packages/pylab.py
-
 You will need to have freetype, libpng and zlib installed to compile
 matplotlib, inlcuding the *-devel versions of these libraries if you
 are using a package manager like RPM or debian.
@@ -62,8 +58,6 @@
 import sys
 major, minor1, minor2, s, tmp = sys.version_info
 
-if major==2 and minor1==2:
-    print >> sys.stderr, "***\n\nWARNING, see build info for python2.2 in the header of setup.py\n\n***"
 if major==2 and minor1<=3:
     # setuptools monkeypatches distutils.core.Distribution to support
     # package_data
@@ -78,12 +72,13 @@
 directory.""")
 
 import glob
-from distutils.core import Extension, setup
+#from distutils.core import Extension, setup
+from setuptools import setup
 from setupext import build_agg, build_gtkagg, build_tkagg, build_wxagg,\
      build_ft2font, build_image, build_windowing, build_transforms, \
      build_contour, build_nxutils, build_enthought, build_swigagg, build_gdk, \
      build_subprocess, build_ttconv
-import distutils.sysconfig
+#import distutils.sysconfig
 
 for line in file('lib/matplotlib/__init__.py').readlines():
     if line[:11] == '__version__':


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.