Hello community, here is the log from the commit of package python-flaky for openSUSE:Factory checked in at 2020-12-16 10:59:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-flaky (Old) and /work/SRC/openSUSE:Factory/.python-flaky.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-flaky" Wed Dec 16 10:59:35 2020 rev:8 rq:855665 version:3.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-flaky/python-flaky.changes 2020-08-01 12:31:31.838476618 +0200 +++ /work/SRC/openSUSE:Factory/.python-flaky.new.2328/python-flaky.changes 2020-12-16 10:59:37.595519152 +0100 @@ -1,0 +2,20 @@ +Mon Dec 14 00:48:47 UTC 2020 - Benjamin Greiner <c...@bnavigator.de> + +- Fix condition around BuildRequirement + +------------------------------------------------------------------- +Sun Dec 13 20:27:15 UTC 2020 - Matej Cepl <mc...@suse.com> + +- We don't need to break Python 2.7 + +------------------------------------------------------------------- +Fri Dec 11 15:14:53 UTC 2020 - Matej Cepl <mc...@suse.com> + +- Add remove_mock.patch to remove dependency on the external mock package. + +------------------------------------------------------------------- +Fri Dec 11 14:24:39 UTC 2020 - Matej Cepl <mc...@suse.com> + +- Add remove_nose.patch to remove dependency on nose. + +------------------------------------------------------------------- New: ---- remove_mock.patch remove_nose.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-flaky.spec ++++++ --- /var/tmp/diff_new_pack.S2YAI2/_old 2020-12-16 10:59:38.995520527 +0100 +++ /var/tmp/diff_new_pack.S2YAI2/_new 2020-12-16 10:59:38.999520531 +0100 @@ -31,6 +31,12 @@ License: Apache-2.0 URL: https://github.com/box/flaky Source: https://files.pythonhosted.org/packages/source/f/flaky/flaky-%{version}.tar.gz +# PATCH-FEATURE-UPSTREAM remove_nose.patch gh#box/flaky#171 mc...@suse.com +# remove dependency on nose +Patch0: remove_nose.patch +# PATCH-FEATURE-UPSTREAM remove_mock.patch gh#box/flaky#171 mc...@suse.com +# this patch makes things totally awesome +Patch1: remove_mock.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -38,14 +44,15 @@ %if %{with test} BuildRequires: %{python_module flaky >= %{version}} BuildRequires: %{python_module genty} -BuildRequires: %{python_module mock} -BuildRequires: %{python_module nose} BuildRequires: %{python_module pytest} +%if 0%{?suse_version} <= 1500 +BuildRequires: python-mock +%endif %endif %python_subpackages %description -Flaky is a plugin for nose or py.test that automatically reruns flaky tests. +Flaky is a plugin for py.test that automatically reruns flaky tests. Ideally, tests reliably pass or fail, but sometimes test fixtures must rely on components that aren't 100% reliable. With flaky, instead of removing those tests or marking them to @skip, they can be automatically @@ -54,7 +61,7 @@ For more information about flaky, see `this presentation <http://opensource.box.com/flaky/>`_. %prep -%setup -q -n flaky-%{version} +%autosetup -p1 -n flaky-%{version} %if !%{with test} %build @@ -69,16 +76,11 @@ %if %{with test} %check -%{python_expand echo - nosetests="nosetests-%{$python_bin_suffix}" - pytest="pytest-%{$python_bin_suffix}" - $nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ - $pytest -k 'example and not options' --doctest-modules test/test_pytest/ - $pytest -k 'example and not options' test/test_pytest/ - $pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py - $nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py - $pytest --force-flaky --max-runs 2 test/test_pytest/test_pytest_options_example.py -} +%pytest -k 'example and not options' --doctest-modules test/test_pytest/ +%pytest -k 'example and not options' test/test_pytest/ +%pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py +export PYTEST_ADDOPTS="--force-flaky --max-runs 2" +%pytest test/test_pytest/test_pytest_options_example.py %endif %if !%{with test} ++++++ remove_mock.patch ++++++ --- a/test/test_pytest/test_flaky_pytest_plugin.py +++ b/test/test_pytest/test_flaky_pytest_plugin.py @@ -2,7 +2,10 @@ from __future__ import unicode_literals from io import StringIO -from mock import Mock, patch +try: + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch # pylint:disable=import-error import pytest from _pytest.runner import CallInfo ++++++ remove_nose.patch ++++++ ++++ 913 lines (skipped) _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
