SF.net SVN: matplotlib: [4172] trunk/matplotlib

[<ds...@us...>]

Revision: 4172
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4172&view=rev
Author:   dsdale
Date:     2007-11-08 17:37:02 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
remove old version of pytz

Modified Paths:
--------------
    trunk/matplotlib/lib/dateutil/__init__.py
    trunk/matplotlib/setup.py

Removed Paths:
-------------
    trunk/matplotlib/lib/pytz/

Modified: trunk/matplotlib/lib/dateutil/__init__.py
===================================================================
--- trunk/matplotlib/lib/dateutil/__init__.py	2007-11-09 00:31:48 UTC (rev 4171)
+++ trunk/matplotlib/lib/dateutil/__init__.py	2007-11-09 01:37:02 UTC (rev 4172)
@@ -6,3 +6,4 @@
 """
 __author__ = "Gustavo Niemeyer <gu...@ni...>"
 __license__ = "PSF License"
+__version__ = "1.2"

Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py	2007-11-09 00:31:48 UTC (rev 4171)
+++ trunk/matplotlib/setup.py	2007-11-09 01:37:02 UTC (rev 4172)
@@ -197,13 +197,23 @@
     # 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','zoneinfo')):
+        for dirpath, dirname, filenames in os.walk(os.path.join('lib', 'pytz', 
+                                                                'zoneinfo')):
             if '.svn' not in dirpath:
-                packages.append('/'.join(dirpath.split(os.sep)[1:]))
+                # remove the 'lib/pytz' part of the path
+                basepath = dirpath.split(os.path.sep, 2)[2]
+                resources.extend([os.path.join(basepath, filename)
+                                  for filename in filenames])
+        package_data['pytz'] = resources
+        assert len(resources) > 10, 'pytz zoneinfo files not found!'
+#                packages.append('/'.join(dirpath.split(os.sep)[1:]))
 
     def add_dateutil():
         packages.append('dateutil')
+        packages.append('dateutil/zoneinfo')
+        package_data['dateutil'] = ['zoneinfo/zoneinfo*.tar.*']
 
     haspytz = check_for_pytz()
     hasdateutil = check_for_dateutil()


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