Hello community, here is the log from the commit of package python-wxWidgets for openSUSE:Factory checked in at 2015-01-20 12:31:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wxWidgets (Old) and /work/SRC/openSUSE:Factory/.python-wxWidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-wxWidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/python-wxWidgets/python-wxWidgets.changes 2014-08-01 07:08:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-wxWidgets.new/python-wxWidgets.changes 2015-01-20 12:32:22.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 13 23:25:00 UTC 2015 - tzotsos@opensuse.org + +- Added wxpython lib/plot.py patch (numpy 1.9 has removed oldnumeric) + (bnc#907703, wxPython-numpy.patch) + * Backported from upstream trunk to 2.8.12.1 + +------------------------------------------------------------------- New: ---- wxPython-numpy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wxWidgets.spec ++++++ --- /var/tmp/diff_new_pack.Paa7pK/_old 2015-01-20 12:32:25.000000000 +0100 +++ /var/tmp/diff_new_pack.Paa7pK/_new 2015-01-20 12:32:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-wxWidgets # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,6 +59,7 @@ Patch8: wxPython-no-strict-aliasing.patch Patch9: wxPython-no-GraphicsRenderer-CreateBitmap.patch Patch10: wxPython-platlib.patch +Patch11: wxPython-numpy.patch %py_requires %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires @@ -103,6 +104,7 @@ %patch8 %patch9 %patch10 +%patch11 -p1 cp %{S:1} . %build ++++++ wxPython-numpy.patch ++++++ diff -ruN orig/wxPython/wx/lib/plot.py new/wxPython/wx/lib/plot.py --- orig/wxPython/wx/lib/plot.py 2011-03-28 22:48:35.000000000 +0300 +++ new/wxPython/wx/lib/plot.py 2015-01-14 02:28:36.786335732 +0200 @@ -115,7 +115,7 @@ # Needs Numeric or numarray or NumPy try: - import numpy.oldnumeric as _Numeric + import numpy as _Numeric except: try: import numarray as _Numeric #if numarray is used it is renamed Numeric @@ -142,7 +142,7 @@ """ def __init__(self, points, attr): - self._points = _Numeric.array(points).astype(_Numeric.Float64) + self._points = _Numeric.array(points).astype(_Numeric.float64) self._logscale = (False, False) self._pointSize = (1.0, 1.0) self.currentScale= (1,1) @@ -377,9 +377,9 @@ def _circle(self, dc, coords, size=1): fact= 2.5*size wh= 5.0*size - rect= _Numeric.zeros((len(coords),4),_Numeric.Float)+[0.0,0.0,wh,wh] + rect= _Numeric.zeros((len(coords),4),_Numeric.float)+[0.0,0.0,wh,wh] rect[:,0:2]= coords-[fact,fact] - dc.DrawEllipseList(rect.astype(_Numeric.Int32)) + dc.DrawEllipseList(rect.astype(_Numeric.int32)) def _dot(self, dc, coords, size=1): dc.DrawPointList(coords) @@ -387,35 +387,35 @@ def _square(self, dc, coords, size=1): fact= 2.5*size wh= 5.0*size - rect= _Numeric.zeros((len(coords),4),_Numeric.Float)+[0.0,0.0,wh,wh] + rect= _Numeric.zeros((len(coords),4),_Numeric.float)+[0.0,0.0,wh,wh] rect[:,0:2]= coords-[fact,fact] - dc.DrawRectangleList(rect.astype(_Numeric.Int32)) + dc.DrawRectangleList(rect.astype(_Numeric.int32)) def _triangle(self, dc, coords, size=1): shape= [(-2.5*size,1.44*size), (2.5*size,1.44*size), (0.0,-2.88*size)] poly= _Numeric.repeat(coords,3) poly.shape= (len(coords),3,2) poly += shape - dc.DrawPolygonList(poly.astype(_Numeric.Int32)) + dc.DrawPolygonList(poly.astype(_Numeric.int32)) def _triangle_down(self, dc, coords, size=1): shape= [(-2.5*size,-1.44*size), (2.5*size,-1.44*size), (0.0,2.88*size)] poly= _Numeric.repeat(coords,3) poly.shape= (len(coords),3,2) poly += shape - dc.DrawPolygonList(poly.astype(_Numeric.Int32)) + dc.DrawPolygonList(poly.astype(_Numeric.int32)) def _cross(self, dc, coords, size=1): fact= 2.5*size for f in [[-fact,-fact,fact,fact],[-fact,fact,fact,-fact]]: lines= _Numeric.concatenate((coords,coords),axis=1)+f - dc.DrawLineList(lines.astype(_Numeric.Int32)) + dc.DrawLineList(lines.astype(_Numeric.int32)) def _plus(self, dc, coords, size=1): fact= 2.5*size for f in [[-fact,0,fact,0],[0,-fact,0,fact]]: lines= _Numeric.concatenate((coords,coords),axis=1)+f - dc.DrawLineList(lines.astype(_Numeric.Int32)) + dc.DrawLineList(lines.astype(_Numeric.int32)) class PlotGraphics: """Container to hold PolyXXX objects and graph labels -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org