[guiqwt] 01/03: New upstream version 3.0.3
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Wed Oct 12 21:06:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository guiqwt.
commit ad8b67c4598ce73f550f0c79b10d116b88374dd2
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Wed Oct 12 21:46:54 2016 +0200
New upstream version 3.0.3
---
CHANGELOG.md | 7 ++++++
PKG-INFO | 58 +++++++++++++++++++++++++++++++++++++++++++++---
README.md | 18 +++++++--------
doc/installation.rst | 24 +++++++++++++-------
guiqwt.egg-info/PKG-INFO | 58 +++++++++++++++++++++++++++++++++++++++++++++---
guiqwt/__init__.py | 4 ++--
guiqwt/curve.py | 4 ++--
guiqwt/plot.py | 5 ++++-
guiqwt/tests/sift.py | 13 +++++++++--
guiqwt/tools.py | 14 ++++++++++--
setup.py | 56 +++++++++++++++++++++++++++++++++++++++++++++-
sift/create_exe.py | 6 ++++-
src/histogram2d.c | 2 +-
src/mandelbrot.c | 2 +-
src/scaler.cpp | 2 +-
15 files changed, 236 insertions(+), 37 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75ba926..368e07f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
# guiqwt Releases #
+### Version 3.0.3 ###
+
+Bug fixes:
+
+* Fixed Spyder v3.0 compatibility issues.
+
+
### Version 3.0.2 ###
Bug fixes:
diff --git a/PKG-INFO b/PKG-INFO
index a43d300..78b371c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,64 @@
Metadata-Version: 1.1
Name: guiqwt
-Version: 3.0.2
-Summary: guiqwt is a set of tools for curve and image plotting (extension to `PythonQwt`)
+Version: 3.0.3
+Summary: guiqwt is a set of tools for curve and image plotting (extension to PythonQwt)
Home-page: https://github.com/PierreRaybaut/guiqwt
Author: Pierre Raybaut
Author-email: pierre.raybaut at gmail.com
License: CeCILL V2
-Description: UNKNOWN
+Description: guiqwt: Python tools for curve and image plotting
+ =================================================
+
+ .. image:: http://pythonhosted.org/guiqwt/_images/panorama.png
+
+ See `documentation`_ for more details on the library and `changelog`_ for
+ recent history of changes.
+
+ Copyright © 2009-2015 CEA, Pierre Raybaut, licensed under the terms of the
+ `CECILL License`_.
+
+ .. _documentation: http://pythonhosted.org/guiqwt/
+ .. _changelog: https://github.com/PierreRaybaut/guiqwt/blob/master/CHANGELOG.md
+ .. _CECILL License: https://github.com/PierreRaybaut/guiqwt/blob/master/Licence_CeCILL_V2-en.txt
+
+
+ Overview
+ --------
+
+ Based on `PythonQwt`_ (a pure Python/PyQt reimplementation of the curve
+ plotting Qwt C++ library, included in guiqwt base source code) and on the
+ scientific modules NumPy and SciPy, ``guiqwt`` is a Python library providing
+ efficient 2D data-plotting features (curve/image visualization and related
+ tools) for interactive computing and signal/image processing application
+ development. It is based on Qt graphical user interfaces library, and
+ currently supports both ``PyQt4`` and ``PyQt5``.
+
+ Extension to `PythonQwt`_:
+
+ * set of tools for curve and image plotting
+ * GUI-based application development helpers
+
+ .. _PythonQwt: https://pypi.python.org/pypi/PythonQwt
+
+
+ Building, installation, ...
+ ---------------------------
+
+ The following packages are **required**: `PyQt4`_ (or `PyQt5`_),
+ `PythonQwt`_, `guidata`_, `NumPy`_, `SciPy`_ and `Pillow`_.
+
+ .. _PyQt4: https://pypi.python.org/pypi/PyQt4
+ .. _PyQt5: https://pypi.python.org/pypi/PyQt5
+ .. _PythonQwt: https://pypi.python.org/pypi/PythonQwt
+ .. _guidata: https://pypi.python.org/pypi/guidata
+ .. _NumPy: https://pypi.python.org/pypi/NumPy
+ .. _SciPy: https://pypi.python.org/pypi/SciPy
+ .. _Pillow: https://pypi.python.org/pypi/Pillow
+
+ See the `README`_ and `documentation`_ for more details.
+
+ .. _README: https://github.com/PierreRaybaut/guiqwt/blob/master/README.md
+
Platform: UNKNOWN
Classifier: Topic :: Scientific/Engineering
Classifier: Development Status :: 5 - Production/Stable
diff --git a/README.md b/README.md
index 721370f..a2a6318 100644
--- a/README.md
+++ b/README.md
@@ -29,18 +29,18 @@ Extension to ``PythonQwt``:
### Requirements
-- Python 2.6+ or Python 3
-- PyQt4 4.3+ or PyQt5 5.5+
-- PythonQwt 0.5+ (pure Python reimplementation of Qwt6 C++ library)
-- guidata 1.7+
-- NumPy 1.3+ -- NumPy 1.6 or later is required for Windows binaries
-- SciPy 0.7+
-- PIL 1.1.6+
+- Python 2.6+ or Python 3.2+
+- [PyQt4](https://pypi.python.org/pypi/PyQt4) 4.3+ or [PyQt5](https://pypi.python.org/pypi/PyQt5) 5.5+
+- [PythonQwt](https://pypi.python.org/pypi/PythonQwt) 0.5+ (pure Python reimplementation of Qwt6 C++ library)
+- [guidata](https://pypi.python.org/pypi/guidata) 1.7+
+- [NumPy](https://pypi.python.org/pypi/NumPy) 1.6+
+- [SciPy](https://pypi.python.org/pypi/SciPy) 0.7+
+- [Pillow](https://pypi.python.org/pypi/Pillow)
### Optional modules
-- spyderlib 2.1+ for GUI-embedded console support
-- pydicom 0.9.3+ for DICOM I/O support
+- [spyderlib](https://pypi.python.org/pypi/spyder) 2.1+ for GUI-embedded console support
+- [pydicom](https://pypi.python.org/pypi/pydicom) 0.9.3+ for DICOM I/O support
## Building/Installation
diff --git a/doc/installation.rst b/doc/installation.rst
index 580adc2..1dc8087 100644
--- a/doc/installation.rst
+++ b/doc/installation.rst
@@ -6,16 +6,24 @@ Dependencies
Requirements:
* Python 2.x (x>=6) or 3.x (x>=2)
- * PyQt4 4.x (x>=3 ; recommended x>=4) or PyQt5 5.x (x>=5)
- * PythonQwt >=0.5
- * guidata >=1.7
- * NumPy
- * SciPy
- * Pillow
+ * `PyQt4`_ 4.x (x>=3 ; recommended x>=4) or `PyQt5`_ 5.x (x>=5)
+ * `PythonQwt`_ >=0.5
+ * `guidata`_ >=1.7
+ * `NumPy`_, `SciPy`_ and `Pillow`_
Optional Python modules:
- * spyderlib 2.1 for Sift embedded Python console
- * pydicom >=0.9.3 for DICOM files I/O features
+ * `spyderlib`_ 2.1 for Sift embedded Python console
+ * `pydicom`_ >=0.9.3 for DICOM files I/O features
+
+.. _PyQt4: https://pypi.python.org/pypi/PyQt4
+.. _PyQt5: https://pypi.python.org/pypi/PyQt5
+.. _PythonQwt: https://pypi.python.org/pypi/PythonQwt
+.. _guidata: https://pypi.python.org/pypi/guidata
+.. _NumPy: https://pypi.python.org/pypi/NumPy
+.. _SciPy: https://pypi.python.org/pypi/SciPy
+.. _Pillow: https://pypi.python.org/pypi/Pillow
+.. _spyderlib: https://pypi.python.org/pypi/Spyder
+.. _pydicom: https://pypi.python.org/pypi/pydicom
Installation
------------
diff --git a/guiqwt.egg-info/PKG-INFO b/guiqwt.egg-info/PKG-INFO
index a43d300..78b371c 100644
--- a/guiqwt.egg-info/PKG-INFO
+++ b/guiqwt.egg-info/PKG-INFO
@@ -1,12 +1,64 @@
Metadata-Version: 1.1
Name: guiqwt
-Version: 3.0.2
-Summary: guiqwt is a set of tools for curve and image plotting (extension to `PythonQwt`)
+Version: 3.0.3
+Summary: guiqwt is a set of tools for curve and image plotting (extension to PythonQwt)
Home-page: https://github.com/PierreRaybaut/guiqwt
Author: Pierre Raybaut
Author-email: pierre.raybaut at gmail.com
License: CeCILL V2
-Description: UNKNOWN
+Description: guiqwt: Python tools for curve and image plotting
+ =================================================
+
+ .. image:: http://pythonhosted.org/guiqwt/_images/panorama.png
+
+ See `documentation`_ for more details on the library and `changelog`_ for
+ recent history of changes.
+
+ Copyright © 2009-2015 CEA, Pierre Raybaut, licensed under the terms of the
+ `CECILL License`_.
+
+ .. _documentation: http://pythonhosted.org/guiqwt/
+ .. _changelog: https://github.com/PierreRaybaut/guiqwt/blob/master/CHANGELOG.md
+ .. _CECILL License: https://github.com/PierreRaybaut/guiqwt/blob/master/Licence_CeCILL_V2-en.txt
+
+
+ Overview
+ --------
+
+ Based on `PythonQwt`_ (a pure Python/PyQt reimplementation of the curve
+ plotting Qwt C++ library, included in guiqwt base source code) and on the
+ scientific modules NumPy and SciPy, ``guiqwt`` is a Python library providing
+ efficient 2D data-plotting features (curve/image visualization and related
+ tools) for interactive computing and signal/image processing application
+ development. It is based on Qt graphical user interfaces library, and
+ currently supports both ``PyQt4`` and ``PyQt5``.
+
+ Extension to `PythonQwt`_:
+
+ * set of tools for curve and image plotting
+ * GUI-based application development helpers
+
+ .. _PythonQwt: https://pypi.python.org/pypi/PythonQwt
+
+
+ Building, installation, ...
+ ---------------------------
+
+ The following packages are **required**: `PyQt4`_ (or `PyQt5`_),
+ `PythonQwt`_, `guidata`_, `NumPy`_, `SciPy`_ and `Pillow`_.
+
+ .. _PyQt4: https://pypi.python.org/pypi/PyQt4
+ .. _PyQt5: https://pypi.python.org/pypi/PyQt5
+ .. _PythonQwt: https://pypi.python.org/pypi/PythonQwt
+ .. _guidata: https://pypi.python.org/pypi/guidata
+ .. _NumPy: https://pypi.python.org/pypi/NumPy
+ .. _SciPy: https://pypi.python.org/pypi/SciPy
+ .. _Pillow: https://pypi.python.org/pypi/Pillow
+
+ See the `README`_ and `documentation`_ for more details.
+
+ .. _README: https://github.com/PierreRaybaut/guiqwt/blob/master/README.md
+
Platform: UNKNOWN
Classifier: Topic :: Scientific/Engineering
Classifier: Development Status :: 5 - Production/Stable
diff --git a/guiqwt/__init__.py b/guiqwt/__init__.py
index c56887a..2b7bd66 100644
--- a/guiqwt/__init__.py
+++ b/guiqwt/__init__.py
@@ -23,9 +23,9 @@ External resources:
"""
-__version__ = '3.0.2'
+__version__ = '3.0.3'
__description__ = 'guiqwt is a set of tools for curve and image plotting '\
- '(extension to `PythonQwt`)'
+ '(extension to PythonQwt)'
def about(html=True, copyright_only=False):
"""Return text about this package"""
diff --git a/guiqwt/curve.py b/guiqwt/curve.py
index 599d700..fa86834 100644
--- a/guiqwt/curve.py
+++ b/guiqwt/curve.py
@@ -962,8 +962,8 @@ class ErrorBarCurveItem(CurveItem):
yc = plot.transform(ay, y)
_distance, i, _inside, _other = self.hit_test(QPointF(xc, yc))
x0, y0 = self.plot().canvas2plotitem(self, xc, yc)
- x = self.x(i)
- y = self.y(i)
+ x = self._x[i]
+ y = self._y[i]
xmin, xmax, ymin, ymax = self.get_minmax_arrays()
if abs(y0-y) > abs(y0-ymin[i]):
y = ymin[i]
diff --git a/guiqwt/plot.py b/guiqwt/plot.py
index 7e8a7d8..2ad96fb 100644
--- a/guiqwt/plot.py
+++ b/guiqwt/plot.py
@@ -500,7 +500,10 @@ class PlotManager(object):
self.add_tool(BasePlotMenuTool, "item")
self.add_tool(ExportItemDataTool)
try:
- import spyderlib.widgets.objecteditor # analysis:ignore
+ try:
+ import spyderlib.widgets.objecteditor # analysis:ignore
+ except ImportError:
+ import spyder.widgets.variableexplorer.objecteditor # analysis:ignore
self.add_tool(EditItemDataTool)
except ImportError:
pass
diff --git a/guiqwt/tests/sift.py b/guiqwt/tests/sift.py
index 3019a22..eff5a76 100644
--- a/guiqwt/tests/sift.py
+++ b/guiqwt/tests/sift.py
@@ -1119,7 +1119,12 @@ class DockableTabWidget(QTabWidget, DockableWidgetMixin):
try:
- from spyderlib.widgets.internalshell import InternalShell
+ try:
+ # Spyder 2
+ from spyderlib.widgets.internalshell import InternalShell
+ except ImportError:
+ # Spyder 3
+ from spyder.widgets.internalshell import InternalShell
class DockableConsole(InternalShell, DockableWidgetMixin):
LOCATION = Qt.BottomDockWidgetArea
def __init__(self, parent, namespace, message, commands=[]):
@@ -1135,7 +1140,11 @@ try:
self.set_font(font)
self.set_codecompletion_auto(True)
self.set_calltips(True)
- self.setup_completion(size=(300, 180), font=font)
+ try:
+ # Spyder 2
+ self.setup_completion(size=(300, 180), font=font)
+ except TypeError:
+ pass
try:
self.traceback_available.connect(self.show_console)
except AttributeError:
diff --git a/guiqwt/tools.py b/guiqwt/tools.py
index e3f7f4a..1d3ce96 100644
--- a/guiqwt/tools.py
+++ b/guiqwt/tools.py
@@ -1945,7 +1945,12 @@ def edit_curve_data(item):
else:
x, y = item_data
data = np.array([x, y]).T
- from spyderlib.widgets.objecteditor import oedit
+ try:
+ # Spyder 2
+ from spyderlib.widgets.objecteditor import oedit
+ except ImportError:
+ # Spyder 3
+ from spyder.widgets.variableexplorer.objecteditor import oedit
if oedit(data) is not None:
if data.shape[1] > 2:
if data.shape[1] == 3:
@@ -1963,7 +1968,12 @@ def edit_curve_data(item):
def edit_image_data(item):
"""Edit image item data to file"""
- from spyderlib.widgets.objecteditor import oedit
+ try:
+ # Spyder 2
+ from spyderlib.widgets.objecteditor import oedit
+ except ImportError:
+ # Spyder 3
+ from spyder.widgets.variableexplorer.objecteditor import oedit
oedit(item.data)
class EditItemDataTool(ItemManipulationBaseTool):
diff --git a/setup.py b/setup.py
index f30ec0f..480fa1c 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,61 @@ from guiqwt import __description__
# Remove module from list to allow building doc from build dir
del sys.modules['guiqwt']
-LONG_DESCRIPTION = ''
+LONG_DESCRIPTION = """\
+guiqwt: Python tools for curve and image plotting
+=================================================
+
+.. image:: http://pythonhosted.org/guiqwt/_images/panorama.png
+
+See `documentation`_ for more details on the library and `changelog`_ for
+recent history of changes.
+
+Copyright © 2009-2015 CEA, Pierre Raybaut, licensed under the terms of the
+`CECILL License`_.
+
+.. _documentation: http://pythonhosted.org/guiqwt/
+.. _changelog: https://github.com/PierreRaybaut/guiqwt/blob/master/CHANGELOG.md
+.. _CECILL License: https://github.com/PierreRaybaut/guiqwt/blob/master/Licence_CeCILL_V2-en.txt
+
+
+Overview
+--------
+
+Based on `PythonQwt`_ (a pure Python/PyQt reimplementation of the curve
+plotting Qwt C++ library, included in guiqwt base source code) and on the
+scientific modules NumPy and SciPy, ``guiqwt`` is a Python library providing
+efficient 2D data-plotting features (curve/image visualization and related
+tools) for interactive computing and signal/image processing application
+development. It is based on Qt graphical user interfaces library, and
+currently supports both ``PyQt4`` and ``PyQt5``.
+
+Extension to `PythonQwt`_:
+
+* set of tools for curve and image plotting
+* GUI-based application development helpers
+
+.. _PythonQwt: https://pypi.python.org/pypi/PythonQwt
+
+
+Building, installation, ...
+---------------------------
+
+The following packages are **required**: `PyQt4`_ (or `PyQt5`_),
+`PythonQwt`_, `guidata`_, `NumPy`_, `SciPy`_ and `Pillow`_.
+
+.. _PyQt4: https://pypi.python.org/pypi/PyQt4
+.. _PyQt5: https://pypi.python.org/pypi/PyQt5
+.. _PythonQwt: https://pypi.python.org/pypi/PythonQwt
+.. _guidata: https://pypi.python.org/pypi/guidata
+.. _NumPy: https://pypi.python.org/pypi/NumPy
+.. _SciPy: https://pypi.python.org/pypi/SciPy
+.. _Pillow: https://pypi.python.org/pypi/Pillow
+
+See the `README`_ and `documentation`_ for more details.
+
+.. _README: https://github.com/PierreRaybaut/guiqwt/blob/master/README.md
+"""
+
KEYWORDS = ''
CLASSIFIERS = ['Topic :: Scientific/Engineering']
if 'beta' in __version__ or 'b' in __version__:
diff --git a/sift/create_exe.py b/sift/create_exe.py
index 8360704..4ba45ce 100644
--- a/sift/create_exe.py
+++ b/sift/create_exe.py
@@ -29,7 +29,11 @@ def create_executable():
import spyderlib
spyderlib.add_to_distribution(dist)
except ImportError:
- pass
+ try:
+ import spyder
+ spyder.add_to_distribution(dist)
+ except ImportError:
+ pass
dist.excludes += ['IPython']
# Building executable
diff --git a/src/histogram2d.c b/src/histogram2d.c
index 0b9b36d..3355cdd 100644
--- a/src/histogram2d.c
+++ b/src/histogram2d.c
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.19.2 on Sun Jan 17 14:50:52 2016 */
+/* Generated by Cython 0.19.2 on Wed Oct 12 18:56:00 2016 */
#define PY_SSIZE_T_CLEAN
#ifndef CYTHON_USE_PYLONG_INTERNALS
diff --git a/src/mandelbrot.c b/src/mandelbrot.c
index 0a8a0b6..b1fd52a 100644
--- a/src/mandelbrot.c
+++ b/src/mandelbrot.c
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.19.2 on Sun Jan 17 14:50:52 2016 */
+/* Generated by Cython 0.19.2 on Wed Oct 12 18:56:00 2016 */
#define PY_SSIZE_T_CLEAN
#ifndef CYTHON_USE_PYLONG_INTERNALS
diff --git a/src/scaler.cpp b/src/scaler.cpp
index 4b2ccc8..1c546a9 100644
--- a/src/scaler.cpp
+++ b/src/scaler.cpp
@@ -294,7 +294,7 @@ void _scale_rgb(DEST& dest,
scale.set_bg( it() );
} else {
val = interpolate(src, tr, p);
- if (isnan(val)) {
+ if (isnan((float) val)) {
scale.set_bg( it() );
} else {
it() = scale.eval(val);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/guiqwt.git
More information about the debian-science-commits
mailing list