Accepting request 96956 from devel:languages:python

1.1.0 update  (forwarded request 96818 from HighwayStar)

OBS-URL: https://build.opensuse.org/request/show/96956
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-matplotlib?expand=0&rev=15

matplotlib-1.0.1-plot_directive.patch

@@ -1,12 +0,0 @@
-diff -uNr matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py
---- matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py	2011-01-23 05:42:08.000000000 +0900
-+++ matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py	2011-01-23 05:44:48.000000000 +0900
-@@ -346,7 +346,7 @@
-         del options['nofigs']
- 
-     formats = setup.config.plot_formats
--    if type(formats) == str:
-+    if type(formats) == str or type(formats) == unicode:
-         formats = eval(formats)
- 
-     fname = os.path.basename(plot_path)

matplotlib-1.0.1-tkinter.patch

@@ -1,15 +0,0 @@
-Index: matplotlib-1.0.1/setupext.py
-===================================================================
---- matplotlib-1.0.1.orig/setupext.py
-+++ matplotlib-1.0.1/setupext.py
-@@ -829,8 +829,8 @@ def check_for_tk():
-                 gotit = False
- 
-     if gotit:
--        print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" %
--                     (Tkinter.__version__.split()[-2], Tkinter.TkVersion, Tkinter.TclVersion))
-+        print_status("Tkinter", "Tkinter: found, Tk: %s, Tcl: %s" %
-+                     (Tkinter.TkVersion, Tkinter.TclVersion))
-     else:
-         print_status("Tkinter", "no")
-     if explanation is not None:

matplotlib-1.0.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08529d50edfb36393699b10832154eff79d3eac2523fb526e00c0bd12fab969d
-size 12214424

matplotlib-1.1.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f9c66dfad96c83bdd8cab464f4f0cfa4760b57b34bac79327d5f979d223e6c4
+size 33858778

matplotlib-linux3.patch

@@ -1,43 +0,0 @@
---- doc/mpl_examples/api/font_file.py
-+++ doc/mpl_examples/api/font_file.py
-@@ -17,7 +17,7 @@
- 
- if sys.platform == 'win32':
-     fpath = 'C:\\Windows\\Fonts\\Tahoma.ttf'
--elif sys.platform == 'linux2':
-+elif sys.platform == 'linux2' or sys.platform == 'linux3':
-     fonts = ['/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf',
-       '/usr/share/fonts/truetype/ttf-liberation/LiberationSans-BoldItalic.ttf',
-       '/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf',
---- examples/api/font_file.py
-+++ examples/api/font_file.py
-@@ -17,7 +17,7 @@
- 
- if sys.platform == 'win32':
-     fpath = 'C:\\Windows\\Fonts\\Tahoma.ttf'
--elif sys.platform == 'linux2':
-+elif sys.platform == 'linux2' or sys.platform == 'linux3':
-     fonts = ['/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf',
-       '/usr/share/fonts/truetype/ttf-liberation/LiberationSans-BoldItalic.ttf',
-       '/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf',
---- lib/mpl_examples/api/font_file.py
-+++ lib/mpl_examples/api/font_file.py
-@@ -17,7 +17,7 @@
- 
- if sys.platform == 'win32':
-     fpath = 'C:\\Windows\\Fonts\\Tahoma.ttf'
--elif sys.platform == 'linux2':
-+elif sys.platform == 'linux2' or sys.platform == 'linux3':
-     fonts = ['/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf',
-       '/usr/share/fonts/truetype/ttf-liberation/LiberationSans-BoldItalic.ttf',
-       '/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf',
---- setupext.py
-+++ setupext.py
-@@ -53,6 +53,7 @@
-     'linux2-hppa' : ['/usr/local', '/usr'],
-     'linux2-mips' : ['/usr/local', '/usr'],
-     'linux2-sparc' : ['/usr/local', '/usr'],
-+    'linux3' : ['/usr/local', '/usr'],
-     'linux2' : ['/usr/local', '/usr'],
-     'linux'  : ['/usr/local', '/usr',],
-     'cygwin' : ['/usr/local', '/usr',],

python-matplotlib.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Dec 14 08:56:13 UTC 2011 - highwaystar.ru@gmail.com
+
+- update to 1.1.0
+ * module for drawing sankey diagrams;
+ * environment for creating animated graphics – module animation;
+ * automated positioning charts, labels, and axes on the canvas – a 
+   team tight_layout () will distribute them so that they are not 
+   people came to each other;
+ *  Work on integration with PySide, although functional is still 
+    in the beta-version and it is recommended to continue using 
+    PyQt4;
+ * improved mapping and positioning of the legend;
+ * simplified work with three-dimensional graphs (module mplot3d), 
+   also significantly expanded and updated documentation on mplot3d;
+ * uniform markers;
+ * completely removed the old module support Numerix, now all 
+   users must use Numpy;
+ * fixes some bugs.
+- removed patches that now upstream
+
 -------------------------------------------------------------------
 Thu Dec  8 13:54:40 UTC 2011 - coolo@suse.com
 

python-matplotlib.spec

@@ -15,8 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:           python-matplotlib
-Version:        1.0.1
+Version:        1.1.0
 Release:        0
 
 Summary:        Plotting Library for Python
@@ -25,10 +27,6 @@ Group:          Development/Libraries/Python
 Url:            http://sourceforge.net/projects/matplotlib
 Source:         matplotlib-%{version}.tar.bz2
 Source1:        matplotlib-setup.cfg
-# This patch taken from upstream SVN and will not be needed for releases later than 1.0.1
-Patch0:         matplotlib-1.0.1-plot_directive.patch
-Patch1:         matplotlib-linux3.patch
-Patch2:         matplotlib-1.0.1-tkinter.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  fltk-devel
@@ -102,9 +100,6 @@ wxWidgets backend for python-matplotlib plotting package
 
 %prep
 %setup -n matplotlib-%{version}
-%patch0 -p1
-%patch1
-%patch2 -p1
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 
 %build
@@ -120,8 +115,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt CHANGELOG INSTALL INTERACTIVE KNOWN_BUGS
+%doc README.txt CHANGELOG INSTALL
-%doc PKG-INFO TODO CXX examples license
+%doc PKG-INFO TODO CXX examples 
 %{py_sitedir}/*
 %exclude %{py_sitedir}/matplotlib/backends/backend_tkagg.*
 %exclude %{py_sitedir}/matplotlib/backends/tkagg.*