[cig-commits] r5972 - in cs/merlin/branches/v1: . merlin/command

[leif at geodynamics.org]

Author: leif
Date: 2007-02-06 19:49:38 -0800 (Tue, 06 Feb 2007)
New Revision: 5972

Modified:
   cs/merlin/branches/v1/merlin/command/easy_install.py
   cs/merlin/branches/v1/setup.py
Log:
Don't consider all PYTHONPATH entries to be 'site' dirs in
get_site_dirs()!!!  What the heck?

This explains the mystery of the missing 'site.py'.  When installing
to a random, non-standard prefix, setuptools/merlin is supposed to
install a magical 'site.py' hack.  Without the magical 'site.py',
adding 'site-packages' to PYTHONPATH does not work -- Python can't
find the eggs contained therein (because it doesn't scan the .pth
files).

Also bumped the version number, in anticipation of a patch release.


Modified: cs/merlin/branches/v1/merlin/command/easy_install.py
===================================================================
--- cs/merlin/branches/v1/merlin/command/easy_install.py	2007-02-07 02:36:48 UTC (rev 5971)
+++ cs/merlin/branches/v1/merlin/command/easy_install.py	2007-02-07 03:49:38 UTC (rev 5972)
@@ -1155,7 +1155,7 @@
 
 def get_site_dirs():
     # return a list of 'site' dirs
-    sitedirs = filter(None,os.environ.get('PYTHONPATH','').split(os.pathsep))
+    sitedirs = []
     prefixes = [sys.prefix]
     if sys.exec_prefix != sys.prefix:
         prefixes.append(sys.exec_prefix)

Modified: cs/merlin/branches/v1/setup.py
===================================================================
--- cs/merlin/branches/v1/setup.py	2007-02-07 02:36:48 UTC (rev 5971)
+++ cs/merlin/branches/v1/setup.py	2007-02-07 03:49:38 UTC (rev 5972)
@@ -19,7 +19,7 @@
 d = {}; execfile(convert_path('merlin/command/__init__.py'), d)
 SETUP_COMMANDS = d['__all__']
 
-VERSION = "1.0"
+VERSION = "1.1"
 from merlin import setup, find_packages
 import sys
 scripts = []