[cig-commits] r5978 - in cs/spatialdata-0.1/trunk/spatialdata: geocoords spatialdb utils

[leif at geodynamics.org]

Author: leif
Date: 2007-02-07 10:50:14 -0800 (Wed, 07 Feb 2007)
New Revision: 5978

Modified:
   cs/spatialdata-0.1/trunk/spatialdata/geocoords/CoordSys.py
   cs/spatialdata-0.1/trunk/spatialdata/geocoords/Projector.py
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SpatialDB.py
   cs/spatialdata-0.1/trunk/spatialdata/utils/ChangeCoordSys.py
   cs/spatialdata-0.1/trunk/spatialdata/utils/CppData.py
   cs/spatialdata-0.1/trunk/spatialdata/utils/PointsStream.py
Log:
Partially reverted r5954: removed calls to 'require'.  Merlin v1.1 now
installs the magic 'site.py' __boot module (as it was supposed to all
along), which should fix any problems with eggs not being importable,
even after adding 'site-packages' to PYTHONPATH.

The Python unit tests should work as well as they did before -- which
is to say, you still have to "make install" first, and add
'site-packages' to your PYTHONPATH.  (I plan to get them to work w/o
installing, but it is awkward because of the lack of integration
between Distutils and Automake.)


Modified: cs/spatialdata-0.1/trunk/spatialdata/geocoords/CoordSys.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/geocoords/CoordSys.py	2007-02-07 18:29:48 UTC (rev 5977)
+++ cs/spatialdata-0.1/trunk/spatialdata/geocoords/CoordSys.py	2007-02-07 18:50:14 UTC (rev 5978)
@@ -13,9 +13,6 @@
 ## @file spatialdata/geocoords/CoordSys.py
 ## @brief Python manager for coordinate systems.
 
-from pkg_resources import require
-require("pythia>=0.8")
-
 from pyre.components.Component import Component
 
 # CoordSys class

Modified: cs/spatialdata-0.1/trunk/spatialdata/geocoords/Projector.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/geocoords/Projector.py	2007-02-07 18:29:48 UTC (rev 5977)
+++ cs/spatialdata-0.1/trunk/spatialdata/geocoords/Projector.py	2007-02-07 18:50:14 UTC (rev 5978)
@@ -13,9 +13,6 @@
 ## @file spatialdata/geocoords/Projector.py
 ## @brief Python manager for projector.
 
-from pkg_resources import require
-require("pythia>=0.8")
-
 from pyre.components.Component import Component
 
 # Projector class

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py	2007-02-07 18:29:48 UTC (rev 5977)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SimpleIO.py	2007-02-07 18:50:14 UTC (rev 5978)
@@ -13,9 +13,6 @@
 ## @file spatialdata/spatialdb/SimpleIO.py
 ## @brief Python I/O manager for simple spatial database (SimpleDB).
 
-from pkg_resources import require
-require("pythia>=0.8")
-
 from pyre.components.Component import Component
 
 # SimpleIO class

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SpatialDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SpatialDB.py	2007-02-07 18:29:48 UTC (rev 5977)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/SpatialDB.py	2007-02-07 18:50:14 UTC (rev 5978)
@@ -13,9 +13,6 @@
 ## @file spatialdata/spatialdb/SpatialDB.py
 ## @brief Python abstract base class for spatial database.
 
-from pkg_resources import require
-require("pythia>=0.8")
-
 from pyre.components.Component import Component
 
 import spatialdb as bindings

Modified: cs/spatialdata-0.1/trunk/spatialdata/utils/ChangeCoordSys.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/utils/ChangeCoordSys.py	2007-02-07 18:29:48 UTC (rev 5977)
+++ cs/spatialdata-0.1/trunk/spatialdata/utils/ChangeCoordSys.py	2007-02-07 18:50:14 UTC (rev 5978)
@@ -13,9 +13,6 @@
 ## @file spatialdata/utils/ChangeCoordSys.py
 ## @brief Python object for changing coordinate system of points.
 
-from pkg_resources import require
-require("pythia>=0.8")
-
 from pyre.components.Component import Component
 
 # ChangeCoordSys class

Modified: cs/spatialdata-0.1/trunk/spatialdata/utils/CppData.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/utils/CppData.py	2007-02-07 18:29:48 UTC (rev 5977)
+++ cs/spatialdata-0.1/trunk/spatialdata/utils/CppData.py	2007-02-07 18:50:14 UTC (rev 5978)
@@ -21,9 +21,6 @@
 ## data, so data is private and object needs a constructor and
 ## destructor. Otherwise, object just has public data and no methods.
 
-from pkg_resources import require
-require("pythia>=0.8")
-
 from pyre.components.Component import Component
 
 import string

Modified: cs/spatialdata-0.1/trunk/spatialdata/utils/PointsStream.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/utils/PointsStream.py	2007-02-07 18:29:48 UTC (rev 5977)
+++ cs/spatialdata-0.1/trunk/spatialdata/utils/PointsStream.py	2007-02-07 18:50:14 UTC (rev 5978)
@@ -13,9 +13,6 @@
 ## @file spatialdata/utils/PointsStream.py
 ## @brief Python object for reading/writing points from stdin/stdout.
 
-from pkg_resources import require
-require("pythia>=0.8")
-
 from pyre.components.Component import Component
 
 # PointsStream class