SF.net SVN: matplotlib: [4806] trunk/toolkits/basemap

[<js...@us...>]

Revision: 4806
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4806&view=rev
Author:   jswhit
Date:     2008-01-08 05:31:49 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
make python 2.4 a requirement, bump version to 0.9.9.1

Modified Paths:
--------------
    trunk/toolkits/basemap/Changelog
    trunk/toolkits/basemap/MANIFEST.in
    trunk/toolkits/basemap/README
    trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/basemap.py
    trunk/toolkits/basemap/setup.py

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2008-01-08 03:11:38 UTC (rev 4805)
+++ trunk/toolkits/basemap/Changelog	2008-01-08 13:31:49 UTC (rev 4806)
@@ -1,3 +1,7 @@
+version 0.9.9.1 (svn revision 4805)
+           * require python 2.4 (really only needed for building).
+             Once namespace packages are re-enabled in matplotlib,
+             python 2.3 should work again.
 version 0.9.9 (svn revision 4799)
            * updated proj4 sources to version 4.6.0.
            * removed hidden dependency on setuptools (in dap module).

Modified: trunk/toolkits/basemap/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap/MANIFEST.in	2008-01-08 03:11:38 UTC (rev 4805)
+++ trunk/toolkits/basemap/MANIFEST.in	2008-01-08 13:31:49 UTC (rev 4806)
@@ -8,7 +8,6 @@
 include KNOWN_BUGS
 include Changelog
 include setup.py
-include setupegg.py
 include src/*
 include examples/simpletest.py
 include examples/hires.py

Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README	2008-01-08 03:11:38 UTC (rev 4805)
+++ trunk/toolkits/basemap/README	2008-01-08 13:31:49 UTC (rev 4806)
@@ -5,7 +5,7 @@
 
 **Requirements**
 
-python 2.3 (or higher)
+python 2.4 (or higher)
 
 matplotlib 0.90 (or higher)
 

Modified: trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/basemap.py	2008-01-08 03:11:38 UTC (rev 4805)
+++ trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/basemap.py	2008-01-08 13:31:49 UTC (rev 4806)
@@ -40,7 +40,7 @@
 # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
 basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
 
-__version__ = '0.9.9'
+__version__ = '0.9.9.1'
 
 # supported map projections.
 _projnames = {'cyl'      : 'Cylindrical Equidistant',

Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py	2008-01-08 03:11:38 UTC (rev 4805)
+++ trunk/toolkits/basemap/setup.py	2008-01-08 13:31:49 UTC (rev 4806)
@@ -1,19 +1,19 @@
-import sys, glob, os
-from distutils.core import setup
+import sys, glob, os, numpy
 major, minor1, minor2, s, tmp = sys.version_info
 if major==2 and minor1<=3:
     # setuptools monkeypatches distutils.core.Distribution to support
     # package_data
-    try: import setuptools
-    except ImportError:
-        raise SystemExit("""
-matplotlib requires setuptools for installation.  Please download
-http://peak.telecommunity.com/dist/ez_setup.py and run it (as su if
-you are doing a system wide install) to install the proper version of
-setuptools for your system""")
+    #try: import setuptools
+    #except ImportError:
+    #    raise SystemExit("""
+#matplotlib requires setuptools for installation.  Please download
+#http://peak.telecommunity.com/dist/ez_setup.py and run it (as su if
+#you are doing a system wide install) to install the proper version of
+#setuptools for your system""")
+    raise SystemExit("""The basemap toolkit requires python 2.4.""")
+from distutils.core import setup
 from distutils.core import Extension
 from distutils.util import convert_path
-import numpy
 
 def dbf_macros():
     """Return the macros to define when compiling the dbflib wrapper.
@@ -147,7 +147,7 @@
 package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
 setup(
   name              = "basemap",
-  version           = "0.9.9",
+  version           = "0.9.9.1",
   description       = "Plot data on map projections with matplotlib",
   long_description  = """
   An add-on toolkit for matplotlib that lets you plot data


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