[Pyphant-devel] SF.net SVN: pyphant:[616] trunk/src

[<zk...@us...>]

Revision: 616
          http://pyphant.svn.sourceforge.net/pyphant/?rev=616&view=rev
Author:   zklaus
Date:     2009-02-18 15:44:01 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
This adapts the various requires to the new distribution naming scheme.

Modified Paths:
--------------
    trunk/src/pyphant/pyphant/tests/TestChart.py
    trunk/src/pyphant/pyphant/tests/TestDataContainer.py
    trunk/src/pyphant/pyphant/tests/TestEventDispatcher.py
    trunk/src/pyphant/pyphant/tests/TestImageVisualizer.py
    trunk/src/pyphant/pyphant/tests/TestPyTablesPersister.py
    trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestApplyMask.py
    trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestDistanceMapper.py
    trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestImageLoader.py
    trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestMedianiser.py
    trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestSkeletonizeFeature.py
    trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestSlopeCalculator.py
    trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestThresholdingWorker.py
    trunk/src/workers/OSC/OSC/tests/TestErrorEstimator.py
    trunk/src/workers/OSC/OSC/tests/TestExtremumFinder.py
    trunk/src/workers/OSC/OSC/tests/TestMRA.py
    trunk/src/workers/OSC/OSC/tests/TestOscAbsorption.py
    trunk/src/workers/Statistics/Statistics/tests/TestHistogram.py
    trunk/src/workers/fmfile/fmfile/tests/TestFMFLoader.py

Modified: trunk/src/pyphant/pyphant/tests/TestChart.py
===================================================================
--- trunk/src/pyphant/pyphant/tests/TestChart.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/pyphant/pyphant/tests/TestChart.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -44,8 +44,8 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
-pkg_resources.require("Pyphant_OSC")
+pkg_resources.require("pyphant")
+pkg_resources.require("pyphant.osc")
 
 import numpy
 from pyphant.visualizers.Chart import LineChart,ScatterPlot

Modified: trunk/src/pyphant/pyphant/tests/TestDataContainer.py
===================================================================
--- trunk/src/pyphant/pyphant/tests/TestDataContainer.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/pyphant/pyphant/tests/TestDataContainer.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -40,7 +40,7 @@
 
 import unittest
 import pkg_resources
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import scipy
 import copy

Modified: trunk/src/pyphant/pyphant/tests/TestEventDispatcher.py
===================================================================
--- trunk/src/pyphant/pyphant/tests/TestEventDispatcher.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/pyphant/pyphant/tests/TestEventDispatcher.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -39,7 +39,7 @@
 
 import unittest
 import pkg_resources
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import pyphant.core.EventDispatcher as EventDispatcher
 

Modified: trunk/src/pyphant/pyphant/tests/TestImageVisualizer.py
===================================================================
--- trunk/src/pyphant/pyphant/tests/TestImageVisualizer.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/pyphant/pyphant/tests/TestImageVisualizer.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -46,8 +46,8 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
-pkg_resources.require("Pyphant_OSC")
+pkg_resources.require("pyphant")
+pkg_resources.require("pyphant.osc")
 
 import numpy
 from pyphant.visualizers.ImageVisualizer import ImageVisualizer

Modified: trunk/src/pyphant/pyphant/tests/TestPyTablesPersister.py
===================================================================
--- trunk/src/pyphant/pyphant/tests/TestPyTablesPersister.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/pyphant/pyphant/tests/TestPyTablesPersister.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -40,7 +40,7 @@
 
 import unittest
 import pkg_resources
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import scipy
 import copy, datetime

Modified: trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestApplyMask.py
===================================================================
--- trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestApplyMask.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestApplyMask.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -43,7 +43,7 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import ImageProcessing as I
 import ImageProcessing.ApplyMask as IM

Modified: trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestDistanceMapper.py
===================================================================
--- trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestDistanceMapper.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestDistanceMapper.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -46,7 +46,7 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import ImageProcessing as I
 import ImageProcessing.DistanceMapper as IM

Modified: trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestImageLoader.py
===================================================================
--- trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestImageLoader.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestImageLoader.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -44,7 +44,7 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import os.path
 

Modified: trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestMedianiser.py
===================================================================
--- trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestMedianiser.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestMedianiser.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -44,7 +44,7 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import ImageProcessing.Medianiser as IM
 import numpy

Modified: trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestSkeletonizeFeature.py
===================================================================
--- trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestSkeletonizeFeature.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestSkeletonizeFeature.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -43,7 +43,7 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import ImageProcessing as I
 import ImageProcessing.SkeletonizeFeature as IM

Modified: trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestSlopeCalculator.py
===================================================================
--- trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestSlopeCalculator.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestSlopeCalculator.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -41,7 +41,7 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import numpy
 import pylab

Modified: trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestThresholdingWorker.py
===================================================================
--- trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestThresholdingWorker.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/ImageProcessing/ImageProcessing/tests/TestThresholdingWorker.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -44,7 +44,7 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import ImageProcessing as I
 import ImageProcessing.ThresholdingWorker as IM

Modified: trunk/src/workers/OSC/OSC/tests/TestErrorEstimator.py
===================================================================
--- trunk/src/workers/OSC/OSC/tests/TestErrorEstimator.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/OSC/OSC/tests/TestErrorEstimator.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -42,8 +42,8 @@
 import unittest
 import pkg_resources
 
-pkg_resources.require("Pyphant")
-pkg_resources.require("Pyphant_OSC")
+pkg_resources.require("pyphant")
+pkg_resources.require("pyphant.osc")
 
 import numpy
 import OSC.ErrorEstimator as OE

Modified: trunk/src/workers/OSC/OSC/tests/TestExtremumFinder.py
===================================================================
--- trunk/src/workers/OSC/OSC/tests/TestExtremumFinder.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/OSC/OSC/tests/TestExtremumFinder.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -44,8 +44,8 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
-pkg_resources.require("Pyphant_OSC")
+pkg_resources.require("pyphant")
+pkg_resources.require("pyphant.osc")
 
 import os.path
 

Modified: trunk/src/workers/OSC/OSC/tests/TestMRA.py
===================================================================
--- trunk/src/workers/OSC/OSC/tests/TestMRA.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/OSC/OSC/tests/TestMRA.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -44,8 +44,8 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
-pkg_resources.require("Pyphant_OSC")
+pkg_resources.require("pyphant")
+pkg_resources.require("pyphant.osc")
 
 import os.path
 

Modified: trunk/src/workers/OSC/OSC/tests/TestOscAbsorption.py
===================================================================
--- trunk/src/workers/OSC/OSC/tests/TestOscAbsorption.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/OSC/OSC/tests/TestOscAbsorption.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -45,8 +45,8 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
-pkg_resources.require("Pyphant_OSC")
+pkg_resources.require("pyphant")
+pkg_resources.require("pyphant.osc")
 
 import os.path
 

Modified: trunk/src/workers/Statistics/Statistics/tests/TestHistogram.py
===================================================================
--- trunk/src/workers/Statistics/Statistics/tests/TestHistogram.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/Statistics/Statistics/tests/TestHistogram.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -43,7 +43,7 @@
 
 import pkg_resources
 
-pkg_resources.require("Pyphant")
+pkg_resources.require("pyphant")
 
 import Statistics.Histogram as S
 from pyphant.visualizers.ImageVisualizer import ImageVisualizer

Modified: trunk/src/workers/fmfile/fmfile/tests/TestFMFLoader.py
===================================================================
--- trunk/src/workers/fmfile/fmfile/tests/TestFMFLoader.py	2009-02-18 15:18:57 UTC (rev 615)
+++ trunk/src/workers/fmfile/fmfile/tests/TestFMFLoader.py	2009-02-18 15:44:01 UTC (rev 616)
@@ -33,7 +33,7 @@
 # $Source$
 
 import pkg_resources
-pkg_resources.require('Pyphant_FMF')
+pkg_resources.require('pyphant.fmf')
 
 import unittest, numpy
 from fmfile import FMFLoader 


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