From 5a15a1a5f01e4aace567c50886b1e243b7b7d1b0243c7705e226e02a877167e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Mon, 1 Mar 2021 09:41:30 +0000
Subject: [PATCH] Accepting request 875544 from
 home:bnavigator:branches:devel:languages:python:jupyter

- Don't test numpy and matplotlib with Python 3.6: There is no
  python36-numpy and python36-matplotlib in TW. (NEP 29)

OBS-URL: https://build.opensuse.org/request/show/875544
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbval?expand=0&rev=15
---
 python-nbval.changes |  6 ++++++
 python-nbval.spec    | 16 ++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/python-nbval.changes b/python-nbval.changes
index d294faf..4bd7eba 100644
--- a/python-nbval.changes
+++ b/python-nbval.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 26 22:34:46 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Don't test numpy and matplotlib with Python 3.6: There is no
+  python36-numpy and python36-matplotlib in TW. (NEP 29) 
+
 -------------------------------------------------------------------
 Thu Dec 17 12:12:35 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
 
diff --git a/python-nbval.spec b/python-nbval.spec
index c887f11..ef50191 100644
--- a/python-nbval.spec
+++ b/python-nbval.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-nbval
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,6 @@ Requires:       python-jupyter-client
 Requires:       python-nbdime
 Requires:       python-nbformat
 Requires:       python-pytest >= 2.8
-Requires:       python-six
 Recommends:     python-matplotlib
 Recommends:     python-pytest-cov
 Recommends:     python-pytest-timeout
@@ -49,7 +48,6 @@ BuildRequires:  %{python_module certifi}
 BuildRequires:  %{python_module coverage}
 BuildRequires:  %{python_module ipykernel}
 BuildRequires:  %{python_module jupyter-client}
-BuildRequires:  %{python_module matplotlib}
 BuildRequires:  %{python_module nbdime}
 BuildRequires:  %{python_module nbformat}
 BuildRequires:  %{python_module notebook}
@@ -57,8 +55,8 @@ BuildRequires:  %{python_module pyinotify}
 BuildRequires:  %{python_module pytest >= 2.8}
 BuildRequires:  %{python_module pytest-cov}
 BuildRequires:  %{python_module pytest-timeout}
-BuildRequires:  %{python_module six}
 BuildRequires:  %{python_module sympy}
+BuildRequires:  %{python_module matplotlib if (%python-base without python36-base)}
 # /SECTION
 %if "%{python_flavor}" == "python3" || "%{?python_provides}"  == "python3"
 Provides:       jupyter-nbval = %{version}
@@ -92,8 +90,14 @@ export LANG=en_US.UTF-8
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-# see dodo.py
-%pytest tests/ --nbval --current-env --sanitize-with tests/sanitize_defaults.cfg --ignore tests/ipynb-test-samples
+python36_donttest="(sample_notebook and 9) or (test_coalesce and 5)"
+# see dodo.py for call signature
+%{pytest tests/ --nbval \
+                --current-env \
+                --sanitize-with tests/sanitize_defaults.cfg \
+                --ignore tests/ipynb-test-samples \
+                ${$python_donttest:+ -k "not (${$python_donttest})"}
+}
 
 %files %{python_files}
 %doc README.md