Menu
▾
▴
[Pyphant-devel] SF.net SVN: pyphant:[714] tags/pyphant-0.8a2/src
|
From: <ah...@us...> - 2011-12-08 17:12:44
|
Revision: 714
http://pyphant.svn.sourceforge.net/pyphant/?rev=714&view=rev
Author: aheld84
Date: 2011-12-08 17:12:37 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Merge branch 'v0.8' into svn-tag-pyphant-0.8a2
* v0.8:
Configured release for v0.8a2
Fix: Bin centers of Histogram worker
Fix: wxPyphant hangs upon exiting
Configured release (version numbering, no .dev tagging).
Modified Paths:
--------------
tags/pyphant-0.8a2/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py
tags/pyphant-0.8a2/src/pyphant/setup.py
tags/pyphant-0.8a2/src/workers/ImageProcessing/setup.py
tags/pyphant-0.8a2/src/workers/OSC/setup.py
tags/pyphant-0.8a2/src/workers/Statistics/Statistics/Histogram.py
tags/pyphant-0.8a2/src/workers/Statistics/setup.py
tags/pyphant-0.8a2/src/workers/fmfile/setup.py
tags/pyphant-0.8a2/src/workers/tools/setup.py
Removed Paths:
-------------
tags/pyphant-0.8a2/src/pyphant/setup.cfg
tags/pyphant-0.8a2/src/workers/ImageProcessing/setup.cfg
tags/pyphant-0.8a2/src/workers/OSC/setup.cfg
tags/pyphant-0.8a2/src/workers/Statistics/setup.cfg
tags/pyphant-0.8a2/src/workers/fmfile/setup.cfg
tags/pyphant-0.8a2/src/workers/tools/setup.cfg
Modified: tags/pyphant-0.8a2/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py
===================================================================
--- tags/pyphant-0.8a2/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py 2011-12-08 17:12:37 UTC (rev 714)
@@ -35,7 +35,7 @@
__id__ = "$Id$"
__author__ = "$Author$"
-__version__ = "Sprint"
+__version__ = "0.8a2"
# $Source$
import os, os.path, pkg_resources
@@ -614,9 +614,10 @@
# wxPyphantFrame is the main frame.
self.parent._frame = wxPyphantFrame(self.parent)
self.parent._frame.Show()
-
+
# The program will freeze without this line.
evt.Skip() # Make sure the default handler runs too...
+ self.Destroy()
import optparse
Deleted: tags/pyphant-0.8a2/src/pyphant/setup.cfg
===================================================================
--- tags/pyphant-0.8a2/src/pyphant/setup.cfg 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/pyphant/setup.cfg 2011-12-08 17:12:37 UTC (rev 714)
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
Modified: tags/pyphant-0.8a2/src/pyphant/setup.py
===================================================================
--- tags/pyphant-0.8a2/src/pyphant/setup.py 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/pyphant/setup.py 2011-12-08 17:12:37 UTC (rev 714)
@@ -4,33 +4,38 @@
__id__ = '$Id: $'
__revision__ = '$Revision: 25 $'
-VERSION = '0.5'
+VERSION = '0.8a2'
from setuptools import setup, find_packages
-setup( name='pyphant',
- version = VERSION,
- description='Workflow modelling app',
- author='Klaus Zimmermann, Andreas W. Liehr',
- author_email='kla...@fm...',
- maintainer='Klaus Zimmermann',
- maintainer_email='zk...@so...',
- license = "BSD",
- url='http://pyphant.sourceforge.net/',
- install_requires=['sogl>=0.2.0',
- 'egenix-mx-base',
- 'paste',
- 'simplejson',
- ## The following are required, but currently not setuptools enabled.
- #'ScientificPython>=2.6',
- #'matplotlib>=0.90.1',
- #'scipy>=0.5.2',
- #'tables>=1.4',
- #'wxPython>=2.6.3.2',
- ],
- packages = find_packages(),
- entry_points={'gui_scripts':['wxPyphant = pyphant.wxgui2.wxPyphantApplication:startWxPyphant']},
- include_package_data = True,
- test_suite = 'pyphant.tests'
- )
+setup(
+ name='pyphant',
+ version=VERSION,
+ description='Workflow modelling app',
+ author='Alexander Held, Andreas W. Liehr, Klaus Zimmermann',
+ author_email='ale...@fm...',
+ maintainer='Alexander Held',
+ maintainer_email='ale...@fm...',
+ license="BSD",
+ url='http://pyphant.sourceforge.net/',
+ install_requires=[
+ 'sogl>=0.2.0',
+ 'paste',
+ 'simplejson',
+ ## The following are required,
+ ## but currently not setuptools enabled.
+ #'ScientificPython',
+ #'matplotlib',
+ #'scipy',
+ #'tables',
+ #'wxPython',
+ #'egenix-mx-base',
+ ],
+ packages=find_packages(),
+ entry_points={'gui_scripts':[
+ 'wxPyphant = pyphant.wxgui2.wxPyphantApplication:startWxPyphant'
+ ]},
+ include_package_data=True,
+ test_suite='pyphant.tests'
+ )
Deleted: tags/pyphant-0.8a2/src/workers/ImageProcessing/setup.cfg
===================================================================
--- tags/pyphant-0.8a2/src/workers/ImageProcessing/setup.cfg 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/ImageProcessing/setup.cfg 2011-12-08 17:12:37 UTC (rev 714)
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
Modified: tags/pyphant-0.8a2/src/workers/ImageProcessing/setup.py
===================================================================
--- tags/pyphant-0.8a2/src/workers/ImageProcessing/setup.py 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/ImageProcessing/setup.py 2011-12-08 17:12:37 UTC (rev 714)
@@ -9,25 +9,29 @@
http://pyphant.sourceforge.net for more information.
"""
-__author__ = "Klaus Zimmermann, Andreas W. Liehr"
+__author__ = "Alexander Held, Andreas W. Liehr, Klaus Zimmermann"
__id__ = '$Id$'
__revision__ = '$Revision: 25 $'
-VERSION = '0.1'
+VERSION = '0.8a2'
import setuptools
setuptools.setup(
- name = "pyphant.imageprocessing",
- version = VERSION,
- author = __author__,
- description = __doc__,
- install_requires=['pyphant>=0.4alpha3'],
- packages = ['ImageProcessing'],
- entry_points = """
+ name="pyphant.imageprocessing",
+ version=VERSION,
+ author=__author__,
+ author_email='ale...@fm...',
+ maintainer='Alexander Held',
+ maintainer_email='ale...@fm...',
+ license="BSD",
+ description=__doc__,
+ install_requires=['pyphant>=0.8a2'],
+ packages=['ImageProcessing'],
+ entry_points="""
[pyphant.workers]
myeentry = ImageProcessing
""",
- test_suite = 'ImageProcessing.tests')
-
+ test_suite='ImageProcessing.tests'
+ )
Deleted: tags/pyphant-0.8a2/src/workers/OSC/setup.cfg
===================================================================
--- tags/pyphant-0.8a2/src/workers/OSC/setup.cfg 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/OSC/setup.cfg 2011-12-08 17:12:37 UTC (rev 714)
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
Modified: tags/pyphant-0.8a2/src/workers/OSC/setup.py
===================================================================
--- tags/pyphant-0.8a2/src/workers/OSC/setup.py 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/OSC/setup.py 2011-12-08 17:12:37 UTC (rev 714)
@@ -6,24 +6,29 @@
Visit http://pyphant.sourceforge.net for more information.
"""
-__author__ = "Klaus Zimmermann, Andreas W. Liehr"
+__author__ = "Andreas W. Liehr, Klaus Zimmermann"
__id__ = '$Id$'
__revision__ = '$Revision: 25 $'
-VERSION = '0.1'
+VERSION = '0.8a2'
import setuptools
setuptools.setup(
- name = "pyphant.osc",
- version = VERSION,
- author = __author__,
- description = __doc__,
- install_requires=['pyphant>=0.4alpha3'],
- packages = ['OSC'],
- entry_points = """
+ name="pyphant.osc",
+ version=VERSION,
+ author=__author__,
+ author_email='kla...@fm...',
+ maintainer='Klaus Zimmermann',
+ maintainer_email='kla...@fm...',
+ license="BSD",
+ description=__doc__,
+ install_requires=['pyphant>=0.8a2'],
+ packages=['OSC'],
+ entry_points="""
[pyphant.workers]
myeentry = OSC
""",
- test_suite='OSC.tests')
+ test_suite='OSC.tests'
+ )
Modified: tags/pyphant-0.8a2/src/workers/Statistics/Statistics/Histogram.py
===================================================================
--- tags/pyphant-0.8a2/src/workers/Statistics/Statistics/Histogram.py 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/Statistics/Statistics/Histogram.py 2011-12-08 17:12:37 UTC (rev 714)
@@ -42,31 +42,33 @@
# $Source$
from pyphant.core import (Connectors, DataContainer,
- Param, Worker)
-import scipy, scipy.stats
+ Worker)
import numpy
class Histogram(Worker.Worker):
API = 2
VERSION = 1
REVISION = "$Revision$"[11:-1]
- name = u"Histogram"
+ name = "Histogram"
_sockets=[("vector", Connectors.TYPE_IMAGE)]
_params = [("bins", "Bins", 10, None)]
@Worker.plug(Connectors.TYPE_IMAGE)
def calculateHistogram(self, vector, subscriber=0):
bins = self.paramBins.value
+ assert bins >= 2
+ # numpy 1.3
try:
histo = numpy.histogram(vector.data.flat, bins, new=True,
range=(numpy.floor(vector.data.min()),
numpy.ceil(vector.data.max())))
- binCenters = histo[1][:-1]+(numpy.diff(histo[1])/2.0)
+ # newer numpy versions
except TypeError:
histo = numpy.histogram(vector.data.flat, bins,
range=(numpy.floor(vector.data.min()),
numpy.ceil(vector.data.max())))
- binCenters = histo[1]+((histo[1][1]-histo[1][0])/2.0)
+ binCenters = histo[1][:-1] + (numpy.diff(histo[1]) / 2.0)
+ assert len(binCenters) == bins == len(histo[0])
xdim = DataContainer.FieldContainer(binCenters, vector.unit,
longname=vector.longname,
shortname=vector.shortname)
Deleted: tags/pyphant-0.8a2/src/workers/Statistics/setup.cfg
===================================================================
--- tags/pyphant-0.8a2/src/workers/Statistics/setup.cfg 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/Statistics/setup.cfg 2011-12-08 17:12:37 UTC (rev 714)
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
Modified: tags/pyphant-0.8a2/src/workers/Statistics/setup.py
===================================================================
--- tags/pyphant-0.8a2/src/workers/Statistics/setup.py 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/Statistics/setup.py 2011-12-08 17:12:37 UTC (rev 714)
@@ -2,32 +2,36 @@
# -*- coding: utf-8 -*-
"""
-Pyphant ImageProcessing toolbox
-This is the ImageProcessing toolbox, that serves as an example off a
-toolbox for the Pyphant framework. In order to use it you must have
+Pyphant Statistics toolbox
+This is the Statistics toolbox, that provides workers
+for the Pyphant framework. In order to use it you must have
the Pyphant framework installed first. Visit
http://pyphant.sourceforge.net for more information.
"""
-__author__ = "Klaus Zimmermann, Andreas W. Liehr"
+__author__ = "Alexander Held, Andreas W. Liehr, Klaus Zimmermann"
__id__ = '$Id$'
__revision__ = '$Revision: 25 $'
-VERSION = '0.1'
+VERSION = '0.8a2'
import setuptools
setuptools.setup(
- name = "pyphant.statistics",
- version = VERSION,
- author = __author__,
- description = __doc__,
- install_requires=['pyphant>=0.4alpha3'],
- packages = ['Statistics'],
- entry_points = """
+ name="pyphant.statistics",
+ version=VERSION,
+ author=__author__,
+ author_email='ale...@fm...',
+ maintainer='Alexander Held',
+ maintainer_email='ale...@fm...',
+ license="BSD",
+ description=__doc__,
+ install_requires=['pyphant>=0.8a2'],
+ packages=['Statistics'],
+ entry_points="""
[pyphant.workers]
myeentry = Statistics
""",
- test_suite = 'Statistics.tests')
-
+ test_suite='Statistics.tests'
+ )
Deleted: tags/pyphant-0.8a2/src/workers/fmfile/setup.cfg
===================================================================
--- tags/pyphant-0.8a2/src/workers/fmfile/setup.cfg 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/fmfile/setup.cfg 2011-12-08 17:12:37 UTC (rev 714)
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
Modified: tags/pyphant-0.8a2/src/workers/fmfile/setup.py
===================================================================
--- tags/pyphant-0.8a2/src/workers/fmfile/setup.py 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/fmfile/setup.py 2011-12-08 17:12:37 UTC (rev 714)
@@ -6,28 +6,35 @@
Visit http://pyphant.sourceforge.net for more information.
"""
-__author__ = "Klaus Zimmermann, Andreas W. Liehr"
+__author__ = "Alexander Held, Andreas W. Liehr, Rolf Wuerdemann, " +\
+ "Klaus Zimmermann"
__id__ = '$Id$'
__revision__ = '$Revision: 25 $'
-VERSION = '0.1'
+VERSION = '0.8a2'
import setuptools
setuptools.setup(
- name = "pyphant.fmf",
- version = VERSION,
- author = __author__,
- description = __doc__,
- install_requires=['pyphant>=0.4alpha3',
- 'ConfigObj'
- ],
- packages = ['fmfile'],
- entry_points = """
+ name="pyphant.fmf",
+ version=VERSION,
+ author=__author__,
+ author_email='ale...@fm...',
+ maintainer='Alexander Held',
+ maintainer_email='ale...@fm...',
+ license="BSD",
+ description=__doc__,
+ install_requires=[
+ 'pyphant>=0.8a2',
+ 'ConfigObj'
+ ],
+ packages=['fmfile'],
+ entry_points="""
[pyphant.workers]
myeentry = fmfile
[pyphant.visualizers]
pil.image = fmfile.FMFWriter:FMFWriter
""",
- test_suite='fmfile.tests')
+ test_suite='fmfile.tests'
+ )
Deleted: tags/pyphant-0.8a2/src/workers/tools/setup.cfg
===================================================================
--- tags/pyphant-0.8a2/src/workers/tools/setup.cfg 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/tools/setup.cfg 2011-12-08 17:12:37 UTC (rev 714)
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1
Modified: tags/pyphant-0.8a2/src/workers/tools/setup.py
===================================================================
--- tags/pyphant-0.8a2/src/workers/tools/setup.py 2011-12-08 17:05:59 UTC (rev 713)
+++ tags/pyphant-0.8a2/src/workers/tools/setup.py 2011-12-08 17:12:37 UTC (rev 714)
@@ -2,28 +2,33 @@
# -*- coding: utf-8 -*-
"""
-Pyphant Organic Solar Cells toolbox
+Pyphant Tools toolbox
Visit http://pyphant.sourceforge.net for more information.
"""
-__author__ = "Klaus Zimmermann, Kai Kaminski"
+__author__ = "Alexander Held, Klaus Zimmermann"
__id__ = '$Id$'
__revision__ = '$Revision: 25 $'
-VERSION = '0.1'
+VERSION = '0.8a2'
import setuptools
setuptools.setup(
- name = "pyphant.tools",
- version = VERSION,
- author = __author__,
- description = __doc__,
- install_requires=['pyphant>=0.4alpha3'],
- packages = ['tools'],
- entry_points = """
+ name="pyphant.tools",
+ version=VERSION,
+ author=__author__,
+ author_email='ale...@fm...',
+ maintainer='Alexander Held',
+ maintainer_email='ale...@fm...',
+ license="BSD",
+ description=__doc__,
+ install_requires=['pyphant>=0.8a2'],
+ packages=['tools'],
+ entry_points="""
[pyphant.workers]
myeentry = tools
""",
- test_suite='tools.tests')
+ test_suite='tools.tests'
+ )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|