From 3491d44213a0964116c4b277d3b2df8011bb9df0 Mon Sep 17 00:00:00 2001 From: dgarcia <> Date: Sat, 10 Dec 2022 20:17:57 +0000 Subject: [PATCH] Update python-pytest-verbose-parametrize to version 1.7.0 / rev 7 via SR 1041846 https://build.opensuse.org/request/show/1041846 by user dgarcia + dimstar_suse --- .../python-pytest-verbose-parametrize/.files | Bin 384 -> 468 bytes .../p/python-pytest-verbose-parametrize/.rev | 8 +++++ ...on-pytest-verbose-parametrize-no-six.patch | 29 ++++++++++++++++++ .../python-pytest-verbose-parametrize.changes | 8 +++++ .../python-pytest-verbose-parametrize.spec | 4 +-- 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize-no-six.patch diff --git a/packages/p/python-pytest-verbose-parametrize/.files b/packages/p/python-pytest-verbose-parametrize/.files index b38413d786b3f554c8e03ff28f37a86a193bf561..1aee8ee82b9b78a95f917276c8d99f6e6031d1c2 100644 GIT binary patch delta 163 zcmWN}yA8rH5CG7i07Vcx1ccHh`259P7C;EKf`u4}^iS_y{>sfT zPGVJ+MNzCj{i1KGI#?Uf84T>DcM24GCITCiQPQ%VX_sNQZ6D8eyuZ2uC%WbDC11}q zD+no~5zZ$7c7}o$&dPN1!D}gVdpuAuWJyB=RtO2%C{`q#mV!`&oc|`nemM@2{->WS Ag#Z8m delta 114 zcmcb@+`w#DP+Vfb%EipUz`)9-U}$b=Vw{>{Vwq%SXlQC;W}al8W@3_(WMph+ZeeU{ z2vnsxu~2bx10&bOcfJ!B`l^^2BpX{MC7UK0CK+0oCYhurnweRenbD$12 MkdE_=tP{B%06|6_Q~&?~ diff --git a/packages/p/python-pytest-verbose-parametrize/.rev b/packages/p/python-pytest-verbose-parametrize/.rev index 765699d58bb..1313ada5a9f 100644 --- a/packages/p/python-pytest-verbose-parametrize/.rev +++ b/packages/p/python-pytest-verbose-parametrize/.rev @@ -51,4 +51,12 @@ 971976 + + 62a2e27f42d4ed81f610293c1ec463bc + 1.7.0 + + dimstar_suse + + 1041846 + diff --git a/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize-no-six.patch b/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize-no-six.patch new file mode 100644 index 00000000000..70f31089b49 --- /dev/null +++ b/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize-no-six.patch @@ -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: diff --git a/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.changes b/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.changes index 524a7a7e89d..e382dd68c50 100644 --- a/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.changes +++ b/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 8 13:18:34 UTC 2022 - pgajdos@suse.com + +- 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 diff --git a/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.spec b/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.spec index 2511c605e54..d5ffda96a17 100644 --- a/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.spec +++ b/packages/p/python-pytest-verbose-parametrize/python-pytest-verbose-parametrize.spec @@ -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