diff --git a/python-hvac-no-mock.patch b/python-hvac-no-mock.patch new file mode 100644 index 0000000..4d2c0d7 --- /dev/null +++ b/python-hvac-no-mock.patch @@ -0,0 +1,37 @@ +Index: hvac-0.11.2/tests/unit_tests/api/secrets_engines/test_kv.py +=================================================================== +--- hvac-0.11.2.orig/tests/unit_tests/api/secrets_engines/test_kv.py ++++ hvac-0.11.2/tests/unit_tests/api/secrets_engines/test_kv.py +@@ -1,6 +1,6 @@ + from unittest import TestCase + +-from mock import MagicMock ++from unittest.mock import MagicMock + from parameterized import parameterized + + from hvac.api.secrets_engines.kv import Kv +Index: hvac-0.11.2/tests/unit_tests/api/test_vault_api_category.py +=================================================================== +--- hvac-0.11.2.orig/tests/unit_tests/api/test_vault_api_category.py ++++ hvac-0.11.2/tests/unit_tests/api/test_vault_api_category.py +@@ -1,6 +1,6 @@ + from unittest import TestCase + +-from mock import create_autospec ++from unittest.mock import create_autospec + + from hvac.adapters import Adapter + from hvac.api.vault_api_base import VaultApiBase +Index: hvac-0.11.2/tests/unit_tests/v1/test_aws_iam_methods.py +=================================================================== +--- hvac-0.11.2.orig/tests/unit_tests/v1/test_aws_iam_methods.py ++++ hvac-0.11.2/tests/unit_tests/v1/test_aws_iam_methods.py +@@ -3,7 +3,7 @@ from base64 import b64decode + from datetime import datetime + from unittest import TestCase + +-import mock ++from unittest import mock + + from hvac import Client + diff --git a/python-hvac.changes b/python-hvac.changes index 5574aeb..b127b3e 100644 --- a/python-hvac.changes +++ b/python-hvac.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 2 17:28:37 UTC 2022 - pgajdos@suse.com + +- added patches + fix https://github.com/hvac/hvac/issues/582 + + python-hvac-no-mock.patch + ------------------------------------------------------------------- Sat Oct 16 19:12:22 UTC 2021 - Dirk Müller diff --git a/python-hvac.spec b/python-hvac.spec index 6ed02d7..46c3906 100644 --- a/python-hvac.spec +++ b/python-hvac.spec @@ -1,7 +1,7 @@ # # spec file for package python-hvac # -# Copyright (c) 2021 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 @@ -24,6 +24,8 @@ Summary: HashiCorp Vault API client License: BSD-3-Clause URL: https://github.com/ianunruh/hvac Source: https://github.com/hvac/hvac/archive/v%{version}.tar.gz +# https://github.com/hvac/hvac/issues/582 +Patch0: python-hvac-no-mock.patch BuildRequires: %{python_module Authlib} BuildRequires: %{python_module Flask-SQLAlchemy} BuildRequires: %{python_module Flask} @@ -50,6 +52,7 @@ HashiCorp Vault API client for Python 2/3 %prep %setup -q -n hvac-%{version} +%patch0 -p1 # doctests and ldap need set up ldap server and that is quite an effort rm -r tests/doctest/ rm tests/integration_tests/api/auth_methods/test_ldap.py