Skip to content

Commit

Permalink
Update python-pytest-verbose-parametrize to version 1.7.0 / rev 7 via…
Browse files Browse the repository at this point in the history
… SR 1041846

https://build.opensuse.org/request/show/1041846
by user dgarcia + dimstar_suse
  • Loading branch information
dgarcia authored and bmwiedemann committed Dec 10, 2022
1 parent 2967591 commit 3491d44
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 2 deletions.
Binary file modified packages/p/python-pytest-verbose-parametrize/.files
Binary file not shown.
8 changes: 8 additions & 0 deletions packages/p/python-pytest-verbose-parametrize/.rev
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,12 @@
<comment></comment>
<requestid>971976</requestid>
</revision>
<revision rev="7" vrev="6">
<srcmd5>62a2e27f42d4ed81f610293c1ec463bc</srcmd5>
<version>1.7.0</version>
<time>1670703477</time>
<user>dimstar_suse</user>
<comment></comment>
<requestid>1041846</requestid>
</revision>
</revisionlist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Index: pytest-verbose-parametrize-1.7.0/pytest_verbose_parametrize.py
===================================================================
--- pytest-verbose-parametrize-1.7.0.orig/pytest_verbose_parametrize.py
+++ pytest-verbose-parametrize-1.7.0/pytest_verbose_parametrize.py
@@ -4,14 +4,13 @@ except ImportError:
from collections import Iterable
except ModuleNotFoundError:
from collections import Iterable
-from six import string_types, text_type


def _strize_arg(arg):
try:
s = arg.__name__
except AttributeError:
- s = text_type(arg)
+ s = str(arg)
if len(s) > 32:
s = s[:29] + '...'
return s
@@ -34,7 +33,7 @@ def pytest_generate_tests(metafunc):
if 'ids' not in markers.kwargs:
list_names = []
for i, argvalue in enumerate(markers.args[1]):
- if (not isinstance(argvalue, Iterable)) or isinstance(argvalue, string_types):
+ if (not isinstance(argvalue, Iterable)) or isinstance(argvalue, str):
argvalue = (argvalue,)
name = '-'.join(_strize_arg(arg) for arg in argvalue)
if len(name) > 64:
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Dec 8 13:18:34 UTC 2022 - [email protected]

- do not require six
- added patches
fix https://github.com/man-group/pytest-plugins/issues/209
+ python-pytest-verbose-parametrize-no-six.patch

-------------------------------------------------------------------
Thu Apr 21 20:58:14 UTC 2022 - Ben Greiner <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ Source: https://files.pythonhosted.org/packages/source/p/pytest-verbose-
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
# https://github.com/man-group/pytest-plugins/issues/209
Patch2: python-pytest-verbose-parametrize-no-six.patch
BuildRequires: %{python_module setuptools-git}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-pytest
Requires: python-six
BuildArch: noarch
# SECTION test requirements
BuildRequires: %{python_module coverage}
BuildRequires: %{python_module pytest-virtualenv}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module six}
%if %{with python2}
BuildRequires: python2-mock
%endif
Expand Down

0 comments on commit 3491d44

Please sign in to comment.