From edbd929d1e44a7478fb7a4960667ba0f6afd87ccc4dde3b11be467ed05e6a8ca Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Wed, 24 Mar 2021 10:17:53 +0000
Subject: [PATCH] Accepting request 880828 from
 home:bnavigator:branches:devel:languages:python:numeric

- Update to 0.5
  * fixes the test suite for pytest 6.2
- Skip python36 build: With NumPy 1.20, python36-numpy is no
  longer available in Tumbleweed (NEP 29). Mpi4py depends on NumPy,
  pytest-mpi us almost useless (and not testable) without mpi4py.

OBS-URL: https://build.opensuse.org/request/show/880828
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-pytest-mpi?expand=0&rev=7
---
 pytest-mpi-0.4.tar.gz     |  3 ---
 pytest-mpi-0.5.tar.gz     |  3 +++
 python-pytest-mpi.changes |  9 +++++++++
 python-pytest-mpi.spec    | 12 +++++-------
 4 files changed, 17 insertions(+), 10 deletions(-)
 delete mode 100644 pytest-mpi-0.4.tar.gz
 create mode 100644 pytest-mpi-0.5.tar.gz

diff --git a/pytest-mpi-0.4.tar.gz b/pytest-mpi-0.4.tar.gz
deleted file mode 100644
index 42aecf3..0000000
--- a/pytest-mpi-0.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8879c82a9e837bdb49a1675858a13ef22e61e379c983fd37491f876c299b8b31
-size 34410
diff --git a/pytest-mpi-0.5.tar.gz b/pytest-mpi-0.5.tar.gz
new file mode 100644
index 0000000..8bd1aeb
--- /dev/null
+++ b/pytest-mpi-0.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad392f5cd3f72ed0aeb9bb9e6f77554d79f3b81f72e3526ba60ae34fc2d4359e
+size 33787
diff --git a/python-pytest-mpi.changes b/python-pytest-mpi.changes
index cab29c4..543834a 100644
--- a/python-pytest-mpi.changes
+++ b/python-pytest-mpi.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Mar 15 10:19:55 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to 0.5
+  * fixes the test suite for pytest 6.2
+- Skip python36 build: With NumPy 1.20, python36-numpy is no
+  longer available in Tumbleweed (NEP 29). Mpi4py depends on NumPy,
+  pytest-mpi us almost useless (and not testable) without mpi4py.
+
 -------------------------------------------------------------------
 Tue Feb 23 22:07:18 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-pytest-mpi.spec b/python-pytest-mpi.spec
index 5ae1439..0f93a17 100644
--- a/python-pytest-mpi.spec
+++ b/python-pytest-mpi.spec
@@ -17,10 +17,11 @@
 
 
 %define modname pytest_mpi
-# Module supports only python3
 %define skip_python2 1
+# mpi4py depends on numpy, which is not available for python36
+%define skip_python36 1
 Name:           python-pytest-mpi
-Version:        0.4
+Version:        0.5
 Release:        0
 Summary:        MPI plugin for pytest
 License:        BSD-3-Clause
@@ -30,7 +31,7 @@ BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-pytest
-Requires:       python-sybil
+Recommends:     python-mpi4py
 BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module mpi4py}
@@ -56,10 +57,7 @@ mpi plugin for pytest to collect information from openmpi-based tests.
 %check
 export PATH=${PATH}:%{_libdir}/mpi/gcc/openmpi2/bin
 source %{_libdir}/mpi/gcc/openmpi2/bin/mpivars.sh
-# include `-p pytester` as pytester needs to be manually activated (see https://pytest-mpi.readthedocs.io/en/latest/contributing.html)
-# our pytest version does not like the subclassing of _pytest.Testdir. This disables almost the entire test suite
-# gh#aragilar/pytest-mpi#17
-%pytest -v -p pytester -k "not (test_fixtures or (test_markers and (with_mpi or only_mpi or under_mpi)))"
+%pytest -v -p pytester
 
 %files %{python_files}
 %doc README.md