diff --git a/nbval-filter-mpldeprecation.patch b/nbval-filter-mpldeprecation.patch new file mode 100644 index 0000000..fff7e88 --- /dev/null +++ b/nbval-filter-mpldeprecation.patch @@ -0,0 +1,32 @@ +Index: nbval-0.9.6/tests/ipynb-test-samples/test-latex-pass-correctouput.ipynb +=================================================================== +--- nbval-0.9.6.orig/tests/ipynb-test-samples/test-latex-pass-correctouput.ipynb ++++ nbval-0.9.6/tests/ipynb-test-samples/test-latex-pass-correctouput.ipynb +@@ -37,6 +37,9 @@ + } + ], + "source": [ ++ "import warnings\n", ++ "from matplotlib import MatplotlibDeprecationWarning\n", ++ "warnings.filterwarnings(\"ignore\", category=MatplotlibDeprecationWarning)\n", + "x**2 + y**3" + ] + } +Index: nbval-0.9.6/tests/latex-example.ipynb +=================================================================== +--- nbval-0.9.6.orig/tests/latex-example.ipynb ++++ nbval-0.9.6/tests/latex-example.ipynb +@@ -15,6 +15,13 @@ + }, + "outputs": [], + "source": [ ++ "try:\n", ++ " import warnings\n", ++ " from matplotlib import MatplotlibDeprecationWarning\n", ++ " warnings.filterwarnings(\"ignore\", category=MatplotlibDeprecationWarning)\n", ++ "except ImportError:\n", ++ " # no matplotlib, no problem\n", ++ " pass\n", + "import sympy\n", + "sympy.init_printing()\n", + "x, y = sympy.symbols([\"x\", \"y\"])" diff --git a/python-nbval.changes b/python-nbval.changes index 4bd7eba..6548f9b 100644 --- a/python-nbval.changes +++ b/python-nbval.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 14 13:53:04 UTC 2021 - Ben Greiner + +- Add nbval-filter-mpldeprecation.patch for new Matplotlib 3.4 + deprecation warnings -- gh#computationalmodelling/nbval#167 + ------------------------------------------------------------------- Fri Feb 26 22:34:46 UTC 2021 - Ben Greiner diff --git a/python-nbval.spec b/python-nbval.spec index ef50191..39848a7 100644 --- a/python-nbval.spec +++ b/python-nbval.spec @@ -26,6 +26,8 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/computationalmodelling/nbval Source: https://files.pythonhosted.org/packages/source/n/nbval/nbval-%{version}.tar.gz +# PATCH-FIX-UPSTREAM nbval-filter-mpldeprecation.patch -- gh#computationalmodelling/nbval#167 +Patch0: nbval-filter-mpldeprecation.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -77,7 +79,7 @@ Each cell is taken as a test, a cell that doesn't reproduce the expected output will fail. %prep -%setup -q -n nbval-%{version} +%autosetup -p1 -n nbval-%{version} sed -i 's/\r$//' README.md %build