From 530b79f188f3e55f25701dbba950bce76f267d563f2eddcd91df0804cfb4a683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 5 Sep 2018 20:55:40 +0000 Subject: [PATCH] - drop 0001-Use-unittest.mock-if-is-only-aviable.patch - drop 0001-Use-unittest.mock-if-is-only-aviable.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest?expand=0&rev=12 --- ...Use-unittest.mock-if-is-only-aviable.patch | 28 ------------------- python-pytest-doc.changes | 1 + python-pytest-doc.spec | 2 -- python-pytest.changes | 1 + python-pytest.spec | 2 -- 5 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 0001-Use-unittest.mock-if-is-only-aviable.patch diff --git a/0001-Use-unittest.mock-if-is-only-aviable.patch b/0001-Use-unittest.mock-if-is-only-aviable.patch deleted file mode 100644 index bc2b00e..0000000 --- a/0001-Use-unittest.mock-if-is-only-aviable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cd07c4d4ffad1c9a6fa1c1d8857e7aee1290ccf8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= -Date: Wed, 22 Aug 2018 23:49:40 +0200 -Subject: [PATCH] Use unittest.mock if is only aviable - -from Python 3.3 is mock part of python standard library in unittest namespace ---- - .../example_scripts/acceptance/fixture_mock_integration.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/testing/example_scripts/acceptance/fixture_mock_integration.py b/testing/example_scripts/acceptance/fixture_mock_integration.py -index 51f46f82..c005c919 100644 ---- a/testing/example_scripts/acceptance/fixture_mock_integration.py -+++ b/testing/example_scripts/acceptance/fixture_mock_integration.py -@@ -1,6 +1,9 @@ - """Reproduces issue #3774""" - --import mock -+try: -+ import mock -+except ImportError: -+ import unittest.mock as mock - - import pytest - --- -2.18.0 - diff --git a/python-pytest-doc.changes b/python-pytest-doc.changes index 2bceaeb..2514ea0 100644 --- a/python-pytest-doc.changes +++ b/python-pytest-doc.changes @@ -2,6 +2,7 @@ Tue Sep 4 12:55:25 UTC 2018 - Ondřej Súkup - update to 3.7.4 +- drop 0001-Use-unittest.mock-if-is-only-aviable.patch * Fix possible infinite recursion when writing .pyc files * Cache plugin now obeys the -q flag when --last-failed and --failed-first flags are used. diff --git a/python-pytest-doc.spec b/python-pytest-doc.spec index 6ce6144..bcc2a7d 100644 --- a/python-pytest-doc.spec +++ b/python-pytest-doc.spec @@ -25,7 +25,6 @@ License: MIT Group: Documentation/HTML URL: https://github.com/pytest-dev/pytest Source: https://files.pythonhosted.org/packages/source/p/pytest/pytest-%{version}.tar.gz -Patch0: 0001-Use-unittest.mock-if-is-only-aviable.patch BuildRequires: %{python_module hypothesis} BuildRequires: %{python_module pytest = %{version}} BuildRequires: %{python_module setuptools_scm} @@ -45,7 +44,6 @@ testing tool. %prep %setup -q -n pytest-%{version} -%patch0 -p1 %build python3 setup.py build_sphinx diff --git a/python-pytest.changes b/python-pytest.changes index eafb688..413a798 100644 --- a/python-pytest.changes +++ b/python-pytest.changes @@ -2,6 +2,7 @@ Tue Sep 4 12:55:25 UTC 2018 - Ondřej Súkup - update to 3.7.4 +- drop 0001-Use-unittest.mock-if-is-only-aviable.patch * Fix possible infinite recursion when writing .pyc files * Cache plugin now obeys the -q flag when --last-failed and --failed-first flags are used. diff --git a/python-pytest.spec b/python-pytest.spec index f7ea29f..033b9d7 100644 --- a/python-pytest.spec +++ b/python-pytest.spec @@ -25,7 +25,6 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/pytest-dev/pytest Source: https://files.pythonhosted.org/packages/source/p/pytest/pytest-%{version}.tar.gz -Patch0: 0001-Use-unittest.mock-if-is-only-aviable.patch BuildRequires: %{python_module setuptools_scm} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -63,7 +62,6 @@ pytest is a cross-project Python testing tool. It provides: %prep %setup -q -n pytest-%{version} -%patch0 -p1 %build %python_build