[cig-commits] r5243 - in cs/merlin/branches/v1: . merlin merlin.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2006-11-10 18:30:26 -0800 (Fri, 10 Nov 2006)
New Revision: 5243

Added:
   cs/merlin/branches/v1/pkg_resources.py
Modified:
   cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt
   cs/merlin/branches/v1/merlin.egg-info/top_level.txt
   cs/merlin/branches/v1/merlin/__init__.py
   cs/merlin/branches/v1/setup.py
Log:
Export a dummy pkg_resources module, so that setuptools-based
packages will work.  I'd prefer that merlin didn't muck around
in setuptools' namespace, but right now, I can't think of any
other alternative.


Modified: cs/merlin/branches/v1/merlin/__init__.py
===================================================================
--- cs/merlin/branches/v1/merlin/__init__.py	2006-11-11 01:41:47 UTC (rev 5242)
+++ cs/merlin/branches/v1/merlin/__init__.py	2006-11-11 02:30:26 UTC (rev 5243)
@@ -195,7 +195,7 @@
             pass    # not Mac OS X
     return plat
 
-__all__ += [
+pkg_resources = [
     # Basic resource access and distribution/entry point discovery
     'require', 'run_script', 'get_provider',  'get_distribution',
     'load_entry_point', 'get_entry_map', 'get_entry_info', 'iter_entry_points',
@@ -236,6 +236,10 @@
     # Deprecated/backward compatibility only
     'run_main', 'AvailableDistributions',
 ]
+
+__all__.extend(pkg_resources)
+__all__.append('pkg_resources')
+
 class ResolutionError(Exception):
     """Abstract base for dependency resolution errors"""
     def __repr__(self): return self.__class__.__name__+repr(self.args)

Modified: cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt	2006-11-11 01:41:47 UTC (rev 5242)
+++ cs/merlin/branches/v1/merlin.egg-info/SOURCES.txt	2006-11-11 02:30:26 UTC (rev 5243)
@@ -4,6 +4,7 @@
 easy_install.py
 ez_setup.py
 launcher.c
+pkg_resources.py
 pkg_resources.txt
 release.sh
 setup.cfg

Modified: cs/merlin/branches/v1/merlin.egg-info/top_level.txt
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/top_level.txt	2006-11-11 01:41:47 UTC (rev 5242)
+++ cs/merlin/branches/v1/merlin.egg-info/top_level.txt	2006-11-11 02:30:26 UTC (rev 5243)
@@ -1,2 +1,3 @@
 merlin
+pkg_resources
 site

Added: cs/merlin/branches/v1/pkg_resources.py
===================================================================
--- cs/merlin/branches/v1/pkg_resources.py	2006-11-11 01:41:47 UTC (rev 5242)
+++ cs/merlin/branches/v1/pkg_resources.py	2006-11-11 02:30:26 UTC (rev 5243)
@@ -0,0 +1,6 @@
+
+from merlin import *
+
+import merlin
+
+__all__ = merlin.pkg_resources

Modified: cs/merlin/branches/v1/setup.py
===================================================================
--- cs/merlin/branches/v1/setup.py	2006-11-11 01:41:47 UTC (rev 5242)
+++ cs/merlin/branches/v1/setup.py	2006-11-11 02:30:26 UTC (rev 5243)
@@ -37,7 +37,7 @@
     packages = find_packages(),
     package_data = {'merlin':['*.exe', '*.cfg']},
 
-    py_modules = ['site'],
+    py_modules = ['pkg_resources', 'site'],
 
     zip_safe = (sys.version>="2.5"),   # <2.5 needs unzipped for -m to work