Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytest-verbose-parametrize
for openSUSE:Factory checked in at 2022-04-22 21:54:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-verbose-parametrize (Old)
and
/work/SRC/openSUSE:Factory/.python-pytest-verbose-parametrize.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-verbose-parametrize"
Fri Apr 22 21:54:40 2022 rev:6 rq:971976 version:1.7.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.changes
2022-03-11 21:41:27.950079797 +0100
+++
/work/SRC/openSUSE:Factory/.python-pytest-verbose-parametrize.new.1538/python-pytest-verbose-parametrize.changes
2022-04-22 21:55:52.990917363 +0200
@@ -1,0 +2,8 @@
+Thu Apr 21 20:58:14 UTC 2022 - Ben Greiner <[email protected]>
+
+- Add pytest-fixtures-pr171-remove-mock.patch because mock WAS
+ required and is not pulled in anymore by something else
+ -- gh#man-group/pytest-plugins#171
+- Refresh Iterable-collections.patch for Python 2 compatibility
+
+-------------------------------------------------------------------
New:
----
pytest-fixtures-pr171-remove-mock.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-verbose-parametrize.spec ++++++
--- /var/tmp/diff_new_pack.45OZhE/_old 2022-04-22 21:55:53.506917951 +0200
+++ /var/tmp/diff_new_pack.45OZhE/_new 2022-04-22 21:55:53.510917956 +0200
@@ -17,6 +17,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_without python2
Name: python-pytest-verbose-parametrize
Version: 1.7.0
Release: 0
@@ -28,6 +29,8 @@
# Python 3.10 finally really killed collections class, which are now in
# collections.abc
Patch0: Iterable-collections.patch
+# PATCH-FEATURE-UPSTREAM pytest-fixtures-pr171-remove-mock.patch --
gh#man-group#pytest-plugins#171
+Patch1: pytest-fixtures-pr171-remove-mock.patch
BuildRequires: %{python_module setuptools-git}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -40,6 +43,9 @@
BuildRequires: %{python_module pytest-virtualenv}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module six}
+%if %{with python2}
+BuildRequires: python2-mock
+%endif
# /SECTION
%python_subpackages
@@ -66,6 +72,8 @@
%files %{python_files}
%doc CHANGES.md README.md
%license LICENSE
-%{python_sitelib}/*
+%{python_sitelib}/pytest_verbose_parametrize.py*
+%pycache_only %{python_sitelib}/__pycache__/pytest_verbose_parametrize*.pyc
+%{python_sitelib}/pytest_verbose_parametrize-%{version}*-info
%changelog
++++++ Iterable-collections.patch ++++++
--- /var/tmp/diff_new_pack.45OZhE/_old 2022-04-22 21:55:53.534917983 +0200
+++ /var/tmp/diff_new_pack.45OZhE/_new 2022-04-22 21:55:53.538917988 +0200
@@ -4,11 +4,13 @@
--- a/pytest_verbose_parametrize.py
+++ b/pytest_verbose_parametrize.py
-@@ -1,4 +1,7 @@
+@@ -1,4 +1,9 @@
-from collections import Iterable
+try:
+ from collections.abc import Iterable
-+except (ImportError, ModuleNotFoundError):
++except ImportError:
++ from collections import Iterable
++except ModuleNotFoundError:
+ from collections import Iterable
from six import string_types, text_type
++++++ pytest-fixtures-pr171-remove-mock.patch ++++++
diff --git a/pytest-verbose-parametrize/tests/unit/test_verbose_parametrize.py
b/pytest-verbose-parametrize/tests/unit/test_verbose_parametrize.py
index fcce01d..bba9aa6 100644
--- pytest-verbose-parametrize/tests/unit/test_verbose_parametrize.py
+++ pytest-verbose-parametrize.patched/tests/unit/test_verbose_parametrize.py
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
-from mock import Mock
+try:
+ from unittest.mock import Mock
+except ImportError:
+ from mock import Mock
from pytest_verbose_parametrize import pytest_generate_tests