diff --git a/python-pymacaroons-remove-nose.patch b/python-pymacaroons-remove-nose.patch index 0f6010e..44b0ffc 100644 --- a/python-pymacaroons-remove-nose.patch +++ b/python-pymacaroons-remove-nose.patch @@ -1,7 +1,7 @@ Index: pymacaroons-0.13.0/.coveragerc =================================================================== ---- pymacaroons-0.13.0.orig/.coveragerc 2018-02-21 17:28:11.000000000 +0100 -+++ pymacaroons-0.13.0/.coveragerc 2020-06-26 12:22:40.332298667 +0200 +--- pymacaroons-0.13.0.orig/.coveragerc ++++ pymacaroons-0.13.0/.coveragerc @@ -1,4 +1,3 @@ [report] omit = @@ -9,8 +9,8 @@ Index: pymacaroons-0.13.0/.coveragerc - */site-packages/nose/* Index: pymacaroons-0.13.0/.gitignore =================================================================== ---- pymacaroons-0.13.0.orig/.gitignore 2018-02-21 17:28:11.000000000 +0100 -+++ pymacaroons-0.13.0/.gitignore 2020-06-26 12:22:52.356368845 +0200 +--- pymacaroons-0.13.0.orig/.gitignore ++++ pymacaroons-0.13.0/.gitignore @@ -36,7 +36,6 @@ htmlcov/ .tox/ .coverage @@ -21,8 +21,8 @@ Index: pymacaroons-0.13.0/.gitignore # Translations Index: pymacaroons-0.13.0/requirements.txt =================================================================== ---- pymacaroons-0.13.0.orig/requirements.txt 2018-02-21 17:28:11.000000000 +0100 -+++ pymacaroons-0.13.0/requirements.txt 2020-06-26 12:23:24.492556391 +0200 +--- pymacaroons-0.13.0.orig/requirements.txt ++++ pymacaroons-0.13.0/requirements.txt @@ -2,12 +2,11 @@ -e . @@ -39,8 +39,8 @@ Index: pymacaroons-0.13.0/requirements.txt -yanc Index: pymacaroons-0.13.0/tests/functional_tests/encrypted_field_tests.py =================================================================== ---- pymacaroons-0.13.0.orig/tests/functional_tests/encrypted_field_tests.py 2018-02-21 17:28:11.000000000 +0100 -+++ pymacaroons-0.13.0/tests/functional_tests/encrypted_field_tests.py 2020-06-26 12:43:47.351695424 +0200 +--- pymacaroons-0.13.0.orig/tests/functional_tests/encrypted_field_tests.py ++++ pymacaroons-0.13.0/tests/functional_tests/encrypted_field_tests.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals @@ -70,13 +70,15 @@ Index: pymacaroons-0.13.0/tests/functional_tests/encrypted_field_tests.py + assert verified Index: pymacaroons-0.13.0/tests/functional_tests/functional_tests.py =================================================================== ---- pymacaroons-0.13.0.orig/tests/functional_tests/functional_tests.py 2018-02-21 17:28:11.000000000 +0100 -+++ pymacaroons-0.13.0/tests/functional_tests/functional_tests.py 2020-06-26 12:54:13.491361276 +0200 -@@ -2,7 +2,6 @@ from __future__ import unicode_literals +--- pymacaroons-0.13.0.orig/tests/functional_tests/functional_tests.py ++++ pymacaroons-0.13.0/tests/functional_tests/functional_tests.py +@@ -1,8 +1,7 @@ + from __future__ import unicode_literals import json - from mock import * +-from mock import * -from nose.tools import * ++from unittest.mock import * from nacl.bindings import crypto_box_NONCEBYTES from pymacaroons import Macaroon, MACAROON_V1, MACAROON_V2, Verifier @@ -416,8 +418,8 @@ Index: pymacaroons-0.13.0/tests/functional_tests/functional_tests.py + 'signature 7a9289bfbb92d725f748bbcb4f3e04e56b7021513ebeed8411bfba10a16a662e') Index: pymacaroons-0.13.0/tests/functional_tests/serialization_tests.py =================================================================== ---- pymacaroons-0.13.0.orig/tests/functional_tests/serialization_tests.py 2018-02-21 17:28:11.000000000 +0100 -+++ pymacaroons-0.13.0/tests/functional_tests/serialization_tests.py 2020-06-26 12:31:20.507334403 +0200 +--- pymacaroons-0.13.0.orig/tests/functional_tests/serialization_tests.py ++++ pymacaroons-0.13.0/tests/functional_tests/serialization_tests.py @@ -1,4 +1,4 @@ -from nose.tools import * +import pytest @@ -445,8 +447,8 @@ Index: pymacaroons-0.13.0/tests/functional_tests/serialization_tests.py + assert verified Index: pymacaroons-0.13.0/tests/property_tests/macaroon_property_tests.py =================================================================== ---- pymacaroons-0.13.0.orig/tests/property_tests/macaroon_property_tests.py 2018-02-21 17:28:11.000000000 +0100 -+++ pymacaroons-0.13.0/tests/property_tests/macaroon_property_tests.py 2020-06-26 12:29:44.110771836 +0200 +--- pymacaroons-0.13.0.orig/tests/property_tests/macaroon_property_tests.py ++++ pymacaroons-0.13.0/tests/property_tests/macaroon_property_tests.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals @@ -479,8 +481,8 @@ Index: pymacaroons-0.13.0/tests/property_tests/macaroon_property_tests.py + assert macaroon.signature == deserialized.signature Index: pymacaroons-0.13.0/tox.ini =================================================================== ---- pymacaroons-0.13.0.orig/tox.ini 2018-02-21 17:28:11.000000000 +0100 -+++ pymacaroons-0.13.0/tox.ini 2020-06-26 12:27:56.282142548 +0200 +--- pymacaroons-0.13.0.orig/tox.ini ++++ pymacaroons-0.13.0/tox.ini @@ -5,12 +5,12 @@ skip_missing_interpreters=True [testenv] deps=-rrequirements.txt @@ -504,8 +506,8 @@ Index: pymacaroons-0.13.0/tox.ini + pytest --cov=pymacaroons tests/ Index: pymacaroons-0.13.0/pytest.ini =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ pymacaroons-0.13.0/pytest.ini 2020-06-26 12:51:30.730408348 +0200 +--- /dev/null ++++ pymacaroons-0.13.0/pytest.ini @@ -0,0 +1,5 @@ +[pytest] +python_files = *test*.py diff --git a/python-pymacaroons.changes b/python-pymacaroons.changes index 0b668be..d139eaf 100644 --- a/python-pymacaroons.changes +++ b/python-pymacaroons.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 7 07:22:31 UTC 2022 - pgajdos@suse.com + +- do not require python-mock for build +- modified patches + % python-pymacaroons-remove-nose.patch (refreshed) + ------------------------------------------------------------------- Fri Jun 26 11:39:00 UTC 2020 - pgajdos@suse.com diff --git a/python-pymacaroons.spec b/python-pymacaroons.spec index 7653539..7a740c7 100644 --- a/python-pymacaroons.spec +++ b/python-pymacaroons.spec @@ -1,7 +1,7 @@ # # spec file for package python-pymacaroons # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} - +%define skip_python2 1 Name: python-pymacaroons Version: 0.13.0 Release: 0 @@ -32,7 +32,6 @@ BuildRequires: %{python_module PyNaCl < 2.0} BuildRequires: %{python_module PyNaCl >= 1.1.2} BuildRequires: %{python_module cffi} BuildRequires: %{python_module hypothesis} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six >= 1.8.0}