Merge Darren's win32 build changes to the maintenance branch (since

mdboom · mdboom · commit 79d336988a46 · 2008-01-10T13:38:37.000Z
they'll be handy there also).

svn path=/branches/v0_91_maint/; revision=4846
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+2008-01-10 Fix bug when displaying a tick value offset with scientific
+           notation. (Manifests itself as a warning that the \times
+           symbol can not be found). - MGD
+
+2008-01-10 Use setup.cfg to set the default parameters (tkagg,
+           numpy) when building windows installers - DSD
+
 ===============================================================
 2008-01-06 Released 0.91.2 at revision 4802
 
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 """
 
 # This dict will be updated as we try to select the best option during
-# the build process. However, values in setup.cfg will be used, if 
+# the build process. However, values in setup.cfg will be used, if
 # defined.
 rc = {'backend':'Agg', 'numerix':'numpy'}
 
@@ -36,7 +36,7 @@
 
 if major==2 and minor1<3 or major<2:
     raise SystemExit("""matplotlib requires Python 2.3 or later.""")
-    
+
 import glob
 from distutils.core import setup
 from setupext import build_agg, build_gtkagg, build_tkagg, build_wxagg,\
@@ -112,15 +112,15 @@
     subprocess_dir = os.path.dirname(subprocess.__file__)
     if subprocess_dir.endswith('.egg/subprocess'):
         havesubprocess = False
-        
+
 if not havesubprocess:
     packages.append('subprocess')
     if sys.platform == 'win32':
         build_subprocess(ext_modules, packages)
 
 if not check_for_freetype():
     sys.exit(1)
-    
+
 build_ft2font(ext_modules, packages)
 build_ttconv(ext_modules, packages)
 build_contour(ext_modules, packages)
@@ -145,7 +145,7 @@
    build_windowing(ext_modules, packages)
 
 # the options can be True, False, or 'auto'. If True, try to build
-# regardless of the lack of dependencies. If auto, silently skip 
+# regardless of the lack of dependencies. If auto, silently skip
 # when dependencies are missing.
 if options['build_tkagg']:
     if check_for_tk() or (options['build_tkagg'] is True):
@@ -188,12 +188,12 @@
 
 if hasdatetime: # dates require python23 datetime
     # only install pytz and dateutil if the user hasn't got them
-    
+
     def add_pytz():
         packages.append('pytz')
         resources = ['zone.tab', 'locales/pytz.pot']
         # install pytz subdirs
-        for dirpath, dirname, filenames in os.walk(os.path.join('lib', 'pytz', 
+        for dirpath, dirname, filenames in os.walk(os.path.join('lib', 'pytz',
                                                                 'zoneinfo')):
             if '.svn' not in dirpath:
                 # remove the 'lib/pytz' part of the path
@@ -237,12 +237,8 @@ def add_dateutil():
 print_line()
 
 # Write the default matplotlibrc file
-if sys.platform=='win32':
-    rc['backend'] = 'TkAgg'
-    rc['numerix'] = 'numpy'
-else:
-    if options['backend']: rc['backend'] = options['backend']
-    if options['numerix']: rc['numerix'] = options['numerix']
+if options['backend']: rc['backend'] = options['backend']
+if options['numerix']: rc['numerix'] = options['numerix']
 template = file('matplotlibrc.template').read()
 file('lib/matplotlib/mpl-data/matplotlibrc', 'w').write(template%rc)
 
