From 32ba6610390f5e48a701826c59617c11a3e50e131aa4d8c5a7b385f9f4692270 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 17 Jan 2022 06:32:29 +0000 Subject: [PATCH] Accepting request 946813 from home:bnavigator:branches:devel:languages:python - Don't check coverage - Extend remove-nose.patch to also remove mock OBS-URL: https://build.opensuse.org/request/show/946813 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-expiringdict?expand=0&rev=4 --- python-expiringdict.changes | 6 ++++++ python-expiringdict.spec | 8 +++----- remove-nose.patch | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/python-expiringdict.changes b/python-expiringdict.changes index e5343b9..574ab4f 100644 --- a/python-expiringdict.changes +++ b/python-expiringdict.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 16 16:02:53 UTC 2022 - Benjamin Greiner + +- Don't check coverage +- Extend remove-nose.patch to also remove mock + ------------------------------------------------------------------- Mon Dec 6 05:27:10 UTC 2021 - Steve Kowalik diff --git a/python-expiringdict.spec b/python-expiringdict.spec index ddf53b1..0713c62 100644 --- a/python-expiringdict.spec +++ b/python-expiringdict.spec @@ -1,7 +1,7 @@ # # spec file for package python-expiringdict # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2021, Martin Hauke # # All modifications and additions to the file contributed by third parties @@ -17,7 +17,8 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} +%define skip_python2 1 Name: python-expiringdict Version: 1.2.1 Release: 0 @@ -34,9 +35,6 @@ Requires: python-dill Requires: python-typing BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module coverage} -BuildRequires: %{python_module coveralls} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pytest} # /SECTION %python_subpackages diff --git a/remove-nose.patch b/remove-nose.patch index a02d231..8831652 100644 --- a/remove-nose.patch +++ b/remove-nose.patch @@ -53,8 +53,9 @@ Index: expiringdict-1.2.1/tests/expiringdict_test.py @@ -1,38 +1,40 @@ from time import sleep - from mock import Mock, patch +-from mock import Mock, patch -from nose.tools import assert_raises, eq_, ok_ ++from unittest.mock import Mock, patch from expiringdict import ExpiringDict