diff --git a/python-pytest-fixture-config-no-six.patch b/python-pytest-fixture-config-no-six.patch new file mode 100644 index 0000000..b4b0d10 --- /dev/null +++ b/python-pytest-fixture-config-no-six.patch @@ -0,0 +1,18 @@ +Index: pytest-fixture-config-1.7.0/tests/unit/test_fixture_config.py +=================================================================== +--- pytest-fixture-config-1.7.0.orig/tests/unit/test_fixture_config.py ++++ pytest-fixture-config-1.7.0/tests/unit/test_fixture_config.py +@@ -1,11 +1,11 @@ + import pytest +-from six.moves import reload_module ++from importlib import reload + + # HACK: if the plugin is imported before the coverage plugin then all + # the top-level code will be omitted from coverage, so force it to be + # reloaded within this unit test under coverage + import pytest_fixture_config +-reload_module(pytest_fixture_config) ++reload(pytest_fixture_config) + + from pytest_fixture_config import Config, requires_config, yield_requires_config + diff --git a/python-pytest-fixture-config.changes b/python-pytest-fixture-config.changes index 2a13077..ef75579 100644 --- a/python-pytest-fixture-config.changes +++ b/python-pytest-fixture-config.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 8 11:00:15 UTC 2022 - pgajdos@suse.com + +- do not require six +- added patches + fix https://github.com/man-group/pytest-plugins/issues/209 + + python-pytest-fixture-config-no-six.patch + ------------------------------------------------------------------- Wed Nov 17 03:39:57 UTC 2021 - Steve Kowalik diff --git a/python-pytest-fixture-config.spec b/python-pytest-fixture-config.spec index 2fc072f..cae4ad9 100644 --- a/python-pytest-fixture-config.spec +++ b/python-pytest-fixture-config.spec @@ -1,7 +1,7 @@ # # spec file for package python-pytest-fixture-config # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,10 +25,11 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/manahl/pytest-plugins Source: https://files.pythonhosted.org/packages/source/p/pytest-fixture-config/pytest-fixture-config-%{version}.tar.gz +# https://github.com/man-group/pytest-plugins/issues/209 +Patch0: python-pytest-fixture-config-no-six.patch BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools-git} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-pytest @@ -40,6 +41,7 @@ Fixture configuration utilities for pytest %prep %setup -q -n pytest-fixture-config-%{version} +%patch0 -p1 %build %python_build