diff --git a/0001-Ignore-relevant-parts-of-pytest-by-default.patch b/0001-Ignore-relevant-parts-of-pytest-by-default.patch new file mode 100644 index 0000000..6cbe3b5 --- /dev/null +++ b/0001-Ignore-relevant-parts-of-pytest-by-default.patch @@ -0,0 +1,26 @@ +From d584b65de98a886bfdb4c7747bcdddf9931e0fb3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Anders=20Hovm=C3=B6ller?= +Date: Wed, 24 Oct 2018 11:19:11 +0200 +Subject: [PATCH] Ignore relevant parts of pytest by default + +--- + freezegun/api.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/freezegun/api.py b/freezegun/api.py +index 1bda951..e7aa199 100644 +--- a/freezegun/api.py ++++ b/freezegun/api.py +@@ -705,6 +705,9 @@ def freeze_time(time_to_freeze=None, tz_offset=0, ignore=None, tick=False, as_ar + ignore.append('google.gax') + ignore.append('threading') + ignore.append('Queue') ++ ignore.append('selenium') ++ ignore.append('_pytest.terminal') ++ ignore.append('_pytest.runner') + return _freeze_time(time_to_freeze, tz_offset, ignore, tick, as_arg) + + +-- +2.20.1 + diff --git a/python-freezegun.spec b/python-freezegun.spec index 67d947f..287b4fe 100644 --- a/python-freezegun.spec +++ b/python-freezegun.spec @@ -17,12 +17,18 @@ Name: python-freezegun Version: 0.3.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{sum} License: ASL 2.0 URL: https://pypi.io/project/freezegun Source0: https://pypi.io/packages/source/f/%{modname}/%{modname}-%{version}.tar.gz +# https://github.com/spulec/freezegun/commit/028dee229f06d200d0f79a130deaad65b14779ef +# (rediffed) Fixes an issue that broke the python-cached_property tests +# https://github.com/spulec/freezegun/issues/269 +# https://github.com/ktosiek/pytest-freezegun/issues/6 +# https://github.com/pydanny/cached-property/issues/131 +Patch0: 0001-Ignore-relevant-parts-of-pytest-by-default.patch BuildArch: noarch @@ -77,7 +83,7 @@ mocking the datetime module. This is the Python 3 library. %endif # with python3 %prep -%setup -q -n %{modname}-%{version} +%autosetup -p1 -n %{modname}-%{version} # Remove bundled egg-info in case it exists rm -rf %{modname}.egg-info @@ -135,6 +141,9 @@ nosetests-%{python2_version} tests/ %endif # with python3 %changelog +* Mon Feb 11 2019 Adam Williamson - 0.3.11-4 +- Backport fix for #269 that should fix cached-property tests + * Sat Feb 02 2019 Fedora Release Engineering - 0.3.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild