pool/python-flaky
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 855604 from home:mcepl:branches:devel:tools:scm

Browse Source 
- We don't need to break Python 2.7

OBS-URL: https://build.opensuse.org/request/show/855604
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-flaky?expand=0&rev=16
This commit is contained in:
Matej Cepl 2020-12-13 20:45:22 +00:00 committed by Git OBS Bridge
parent 0a27e432dc
commit 1752fcd3a7
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-flaky.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Dec 13 20:27:15 UTC 2020 - Matej Cepl <mcepl@suse.com>
- We don't need to break Python 2.7
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 11 15:14:53 UTC 2020 - Matej Cepl <mcepl@suse.com> Fri Dec 11 15:14:53 UTC 2020 - Matej Cepl <mcepl@suse.com>

3
python-flaky.spec
View File

@ -45,6 +45,9 @@ BuildArch: noarch
BuildRequires: %{python_module flaky >= %{version}} BuildRequires: %{python_module flaky >= %{version}}
BuildRequires: %{python_module genty} BuildRequires: %{python_module genty}
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
%if "%{python_flavor}" == "python2"
BuildRequires: %{python_module mock}
%endif
%endif %endif
%python_subpackages %python_subpackages

7
remove_mock.patch
View File

@ -1,11 +1,14 @@
--- a/test/test_pytest/test_flaky_pytest_plugin.py --- a/test/test_pytest/test_flaky_pytest_plugin.py
+++ b/test/test_pytest/test_flaky_pytest_plugin.py +++ b/test/test_pytest/test_flaky_pytest_plugin.py
@@ -2,7 +2,7 @@ @@ -2,7 +2,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from io import StringIO from io import StringIO
-from mock import Mock, patch -from mock import Mock, patch
+from unittest.mock import Mock, patch +try:
+ from unittest.mock import Mock, patch
+except ImportError:
+ from mock import Mock, patch
# pylint:disable=import-error # pylint:disable=import-error
import pytest import pytest
from _pytest.runner import CallInfo from _pytest.runner import CallInfo