Accepting request 883567 from devel:languages:python:numeric

OBS-URL: https://build.opensuse.org/request/show/883567
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-matplotlib?expand=0&rev=84
This commit is contained in:
Richard Brown 2021-04-10 13:26:31 +00:00 committed by Git OBS Bridge
commit 3a04372ed7
6 changed files with 117 additions and 43 deletions

View File

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

3
matplotlib-3.4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:84d4c4f650f356678a5d658a43ca21a41fca13f9b8b00169c0b76e6a6a948908
size 37253296

View File

@ -1,30 +0,0 @@
Index: matplotlib-3.3.0/setupext.py
===================================================================
--- matplotlib-3.3.0.orig/setupext.py
+++ matplotlib-3.3.0/setupext.py
@@ -526,7 +526,7 @@ class FreeType(SetupPackage):
default_libraries=['freetype'])
ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'system'))
else:
- src_path = Path('build', f'freetype-{LOCAL_FREETYPE_VERSION}')
+ src_path = Path(f'freetype-{LOCAL_FREETYPE_VERSION}')
# Statically link to the locally-built freetype.
# This is certainly broken on Windows.
ext.include_dirs.insert(0, str(src_path / 'include'))
@@ -543,7 +543,7 @@ class FreeType(SetupPackage):
if options.get('system_freetype'):
return
- src_path = Path('build', f'freetype-{LOCAL_FREETYPE_VERSION}')
+ src_path = Path(f'freetype-{LOCAL_FREETYPE_VERSION}')
# We've already built freetype
if sys.platform == 'win32':
@@ -557,7 +557,6 @@ class FreeType(SetupPackage):
# do we need to download / load the source from cache?
if not src_path.exists():
- os.makedirs('build', exist_ok=True)
tarball = f'freetype-{LOCAL_FREETYPE_VERSION}.tar.gz'
target_urls = [

View File

@ -1,3 +1,98 @@
-------------------------------------------------------------------
Sun Apr 4 16:41:18 UTC 2021 - Arun Persaud <arun@gmx.de>
- specfile:
* update numpy requirement
* removed patch no-builddir-freetype.patch and instead put the source files directly into a
directory that works with the current build system
* also added qhull source code (which otherwise the build process tries to download)
- update to version 3.4.1:
* fix errorbar when specifying fillstyle
* fix Inkscape cleanup at exit on Windows for tests
* fix legends of colour-mapped scatter plots
* fix positioning of annotation fancy arrows
* fix size and color rendering for 3D scatter plots
* fix suptitle manual positioning when using constrained layout
* respect antialiasing settings in cairo backends as well
- changes from version 3.4.0:
* Figure and Axes creation / management
+ New subfigure functionality
+ Single-line string notation for subplot_mosaic
+ Changes to behavior of Axes creation methods (gca, add_axes,
add_subplot)
+ add_subplot/add_axes gained an axes_class parameter
+ Subplot and subplot2grid can now work with constrained layout
* Plotting methods
+ axline supports transform parameter
+ New automatic labeling for bar charts
+ A list of hatches can be specified to bar and barh
+ Setting BarContainer orientation
+ Contour plots now default to using ScalarFormatter
+ Axes.errorbar cycles non-color properties correctly
+ errorbar errorevery parameter matches markevery
+ hexbin supports data reference for C parameter
+ Support callable for formatting of Sankey labels
+ Axes.spines access shortcuts
+ New stairs method and StepPatch artist
+ Added orientation parameter for stem plots
+ Angles on Bracket arrow styles
+ TickedStroke patheffect
* Colors and colormaps
+ Collection color specification and mapping
+ Transparency (alpha) can be set as an array in collections
+ pcolormesh has improved transparency handling by enabling
snapping
+ IPython representations for Colormap objects
+ Colormap.set_extremes and Colormap.with_extremes
+ Get under/over/bad colors of Colormap objects
+ New cm.unregister_cmap function
+ New CenteredNorm for symmetrical data around a center
+ New FuncNorm for arbitrary normalizations
+ GridSpec-based colorbars can now be positioned above or to the
left of the main axes
* Titles, ticks, and labels
+ supxlabel and supylabel
+ Shared-axes subplots tick label visibility is now correct for
top or left labels
+ An iterable object with labels can be passed to Axes.plot
* Fonts and Text
+ Text transform can rotate text direction
+ matplotlib.mathtext now supports overset and underset LaTeX
symbols
+ math_fontfamily parameter to change Text font family
+ TextArea/AnchoredText support horizontalalignment
+ PDF supports URLs on Text artists
* rcParams improvements
+ New rcParams for dates: set converter and whether to use
interval_multiples
+ Date formatters now respect usetex rcParam
+ Setting image.cmap to a Colormap
+ Tick and tick label colors can be set independently using
rcParams
* 3D Axes improvements
+ Errorbar method in 3D Axes
+ Stem plots in 3D Axes
+ 3D Collection properties are now modifiable
+ Panning in 3D Axes
* Interactive tool improvements
+ New RangeSlider widget
+ Sliders can now snap to arbitrary values
+ Pausing and Resuming Animations
* Sphinx extensions
+ plot_directive caption option
* Backend-specific improvements
+ Consecutive rasterized draws now merged
+ Support raw/rgba frame format in FFMpegFileWriter
+ nbAgg/WebAgg support middle-click and double-click
+ nbAgg support binary communication
+ Indexed color for PNG images in PDF files when possible
+ Improved font subsettings in PDF/PS
+ Kerning added to strings in PDFs
+ Fully-fractional HiDPI in QtAgg
+ wxAgg supports fullscreen toggle
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 13 23:43:09 UTC 2021 - Benjamin Greiner <code@bnavigator.de> Sat Feb 13 23:43:09 UTC 2021 - Benjamin Greiner <code@bnavigator.de>

View File

@ -1,5 +1,5 @@
# #
# spec file for package python-matplotlib # spec file for package python-matplotlib-test
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
@ -31,21 +31,21 @@ ExclusiveArch: x86_64 aarch64
%bcond_with test %bcond_with test
%endif %endif
Name: python-matplotlib%{psuffix} Name: python-matplotlib%{psuffix}
Version: 3.3.4 Version: 3.4.1
Release: 0 Release: 0
Summary: Plotting Library for Python Summary: Plotting Library for Python
License: SUSE-Matplotlib License: SUSE-Matplotlib
URL: https://matplotlib.org URL: https://matplotlib.org
Source: https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-%{version}.tar.gz
Source1: matplotlib-setup.cfg Source1: matplotlib-setup.cfg
# Bundled version of freetype for testing purposes only # Bundled version of freetype and qhull for testing purposes only
Source98: http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz
Source99: https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz Source99: https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz
Patch0: no-builddir-freetype.patch
BuildRequires: %{python_module Cycler >= 0.10} BuildRequires: %{python_module Cycler >= 0.10}
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: %{python_module kiwisolver >= 1.0.1} BuildRequires: %{python_module kiwisolver >= 1.0.1}
BuildRequires: %{python_module numpy >= 1.15} BuildRequires: %{python_module numpy >= 1.16}
BuildRequires: %{python_module numpy-devel >= 1.15} BuildRequires: %{python_module numpy-devel >= 1.16}
BuildRequires: %{python_module pip} BuildRequires: %{python_module pip}
BuildRequires: %{python_module pyparsing > 2.2.1} BuildRequires: %{python_module pyparsing > 2.2.1}
BuildRequires: %{python_module pytz} BuildRequires: %{python_module pytz}
@ -58,15 +58,15 @@ BuildRequires: qhull-devel >= 2003.1
Requires: python-Cycler >= 0.10 Requires: python-Cycler >= 0.10
Requires: python-Pillow >= 6.2 Requires: python-Pillow >= 6.2
Requires: python-kiwisolver >= 1.0.1 Requires: python-kiwisolver >= 1.0.1
Requires: python-numpy >= 1.15 Requires: python-numpy >= 1.16
Requires: python-pyparsing > 2.2.1 Requires: python-pyparsing > 2.2.1
Requires: python-python-dateutil >= 2.7 Requires: python-python-dateutil >= 2.7
Requires: python-pytz Requires: python-pytz
Recommends: (%{python_flavor}-matplotlib-tk if tk)
Recommends: ghostscript Recommends: ghostscript
Recommends: libxml2-tools Recommends: libxml2-tools
Recommends: poppler-tools Recommends: poppler-tools
Recommends: python-certifi Recommends: python-certifi
Recommends: (%{python_flavor}-matplotlib-tk if tk)
Provides: python-matplotlib-gtk = %{version} Provides: python-matplotlib-gtk = %{version}
Obsoletes: python-matplotlib-gtk < %{version} Obsoletes: python-matplotlib-gtk < %{version}
# SECTION WebAgg dependencies # SECTION WebAgg dependencies
@ -209,14 +209,20 @@ This package includes the wxWidgets-based wxagg backend
for %{name} plotting package for %{name} plotting package
%prep %prep
%setup -q -n matplotlib-%{version} -a99 %setup -q -n matplotlib-%{version}
#copy freetype to the right location, so that matplotlib will not try to download it
mkdir -p ~/.cache/matplotlib/
SHA=($(sha256sum %{SOURCE98}))
cp %{SOURCE98} ~/.cache/matplotlib/${SHA}
SHA=($(sha256sum %{SOURCE99}))
cp %{SOURCE99} ~/.cache/matplotlib/${SHA}
chmod -x lib/matplotlib/mpl-data/images/*.svg chmod -x lib/matplotlib/mpl-data/images/*.svg
find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py" -exec sed -i "s|#!\/usr\/bin\/env python||" {} \; find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py" -exec sed -i "s|#!\/usr\/bin\/env python||" {} \;
find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py" -exec sed -i "s|#!\/usr\/bin\/python||" {} \; find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py" -exec sed -i "s|#!\/usr\/bin\/python||" {} \;
cp %{SOURCE1} setup.cfg cp %{SOURCE1} setup.cfg
# The setup procedure wants certifi to download packages over https. Not applicable here. # The setup procedure wants certifi to download packages over https. Not applicable here.
sed -i '/"certifi>=.*"/ d' setup.py sed -i '/"certifi>=.*"/ d' setup.py
%patch0 -p1
%build %build
%if !%{with test} %if !%{with test}

BIN
qhull-2020-src-8.0.2.tgz (Stored with Git LFS) Normal file

Binary file not shown.