- Add patch stop-using-jinja-extensions.patch

* Stop using a removed Jinja2 extension.
- Add patch remove-mock.patch
  * Switch to using unittest.mock.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-moban?expand=0&rev=19

python-moban.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 20 06:37:52 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch stop-using-jinja-extensions.patch
+  * Stop using a removed Jinja2 extension.
+- Add patch remove-mock.patch
+  * Switch to using unittest.mock.
+
 -------------------------------------------------------------------
 Thu Sep 24 08:38:23 UTC 2020 - pgajdos@suse.com
 

python-moban.spec

@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# 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
@@ -35,11 +35,12 @@ Version:        0.8.2
 Release:        0
 Summary:        Yet another jinja2 CLI for static text generation
 License:        MIT
-Group:          Development/Languages/Python
 URL:            https://github.com/moremoban/moban
 Source:         https://files.pythonhosted.org/packages/source/m/moban/moban-%{version}.tar.gz
 # https://github.com/moremoban/moban/pull/404
 Patch0:         remove_nose.patch
+Patch1:         stop-using-jinja-extensions.patch
+Patch2:         remove-mock.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  git-core
@@ -68,7 +69,6 @@ BuildRequires:  %{python_module jinja2-fsloader >= 0.2.0}
 BuildRequires:  %{python_module jinja2-time}
 BuildRequires:  %{python_module lml >= 0.0.9}
 BuildRequires:  %{python_module moban-ansible}
-BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module ruamel.yaml >= 0.15.98}
@@ -84,8 +84,7 @@ generation. It is used in the pyexcel project to keep documentation
 consistent across the documentations of individual libraries.
 
 %prep
-%setup -q -n moban-%{version}
+%autosetup -p1 -n moban-%{version}
-%autopatch -p1
 
 %if !%{with test}
 %build

remove-mock.patch

@@ -0,0 +1,153 @@
+Index: moban-0.8.2/tests/core/test_engine.py
+===================================================================
+--- moban-0.8.2.orig/tests/core/test_engine.py
++++ moban-0.8.2/tests/core/test_engine.py
+@@ -2,7 +2,7 @@ import os
+ 
+ import pytest
+ import fs.path
+-from mock import patch
++from unittest.mock import patch
+ 
+ from moban.core import ENGINES
+ from moban.core.definitions import TemplateTarget
+Index: moban-0.8.2/tests/core/test_moban_factory.py
+===================================================================
+--- moban-0.8.2.orig/tests/core/test_moban_factory.py
++++ moban-0.8.2/tests/core/test_moban_factory.py
+@@ -3,7 +3,7 @@ import sys
+ 
+ import pytest
+ import fs.path
+-from mock import patch
++from unittest.mock import patch
+ from lml.plugin import PluginInfo
+ 
+ import moban.exceptions as exceptions
+Index: moban-0.8.2/tests/deprecated/test_handle_requires.py
+===================================================================
+--- moban-0.8.2.orig/tests/deprecated/test_handle_requires.py
++++ moban-0.8.2/tests/deprecated/test_handle_requires.py
+@@ -1,5 +1,5 @@
+ import pytest
+-from mock import patch
++from unittest.mock import patch
+ 
+ from moban.deprecated import GitRequire
+ 
+Index: moban-0.8.2/tests/deprecated/test_repo.py
+===================================================================
+--- moban-0.8.2.orig/tests/deprecated/test_repo.py
++++ moban-0.8.2/tests/deprecated/test_repo.py
+@@ -2,7 +2,7 @@ import unittest
+ 
+ import pytest
+ import fs.path
+-from mock import patch
++from unittest.mock import patch
+ 
+ from moban.deprecated import GitRequire
+ from moban.exceptions import NoGitCommand
+Index: moban-0.8.2/tests/integration_tests/test_command_line_options.py
+===================================================================
+--- moban-0.8.2.orig/tests/integration_tests/test_command_line_options.py
++++ moban-0.8.2/tests/integration_tests/test_command_line_options.py
+@@ -5,7 +5,7 @@ from shutil import copyfile
+ 
+ import fs
+ import pytest
+-from mock import MagicMock, patch
++from unittest.mock import MagicMock, patch
+ 
+ from moban.core.definitions import TemplateTarget
+ 
+Index: moban-0.8.2/tests/mobanfile/test_mobanfile.py
+===================================================================
+--- moban-0.8.2.orig/tests/mobanfile/test_mobanfile.py
++++ moban-0.8.2/tests/mobanfile/test_mobanfile.py
+@@ -1,6 +1,6 @@
+ import pytest
+ import fs.path
+-from mock import patch
++from unittest.mock import patch
+ 
+ from moban.core.definitions import TemplateTarget
+ 
+Index: moban-0.8.2/tests/mobanfile/test_templates.py
+===================================================================
+--- moban-0.8.2.orig/tests/mobanfile/test_templates.py
++++ moban-0.8.2/tests/mobanfile/test_templates.py
+@@ -2,7 +2,7 @@ import unittest
+ 
+ import pytest
+ import fs.path
+-from mock import patch
++from unittest.mock import patch
+ 
+ from moban.core.mobanfile.templates import handle_template
+ 
+Index: moban-0.8.2/tests/test_file_system.py
+===================================================================
+--- moban-0.8.2.orig/tests/test_file_system.py
++++ moban-0.8.2/tests/test_file_system.py
+@@ -5,7 +5,7 @@ from shutil import rmtree
+ 
+ import fs
+ import pytest
+-from mock import patch
++from unittest.mock import patch
+ 
+ from moban.externals import file_system
+ from moban.exceptions import FileNotFound, UnsupportedPyFS2Protocol
+Index: moban-0.8.2/tests/test_main.py
+===================================================================
+--- moban-0.8.2.orig/tests/test_main.py
++++ moban-0.8.2/tests/test_main.py
+@@ -5,7 +5,7 @@ from shutil import copyfile
+ 
+ import fs
+ import pytest
+-from mock import MagicMock, patch
++from unittest.mock import MagicMock, patch
+ 
+ import moban.exceptions as exceptions
+ 
+Index: moban-0.8.2/tests/test_regression.py
+===================================================================
+--- moban-0.8.2.orig/tests/test_regression.py
++++ moban-0.8.2/tests/test_regression.py
+@@ -4,7 +4,7 @@ import filecmp
+ import unittest
+ 
+ import fs
+-from mock import patch
++from unittest.mock import patch
+ 
+ from moban.main import main
+ from .utils import Docs
+Index: moban-0.8.2/tests/test_reporter.py
+===================================================================
+--- moban-0.8.2.orig/tests/test_reporter.py
++++ moban-0.8.2/tests/test_reporter.py
+@@ -2,7 +2,7 @@ import sys
+ import unittest
+ 
+ import pytest
+-from mock import patch
++from unittest.mock import patch
+ 
+ from moban.externals import reporter
+ 
+Index: moban-0.8.2/tests/utils.py
+===================================================================
+--- moban-0.8.2.orig/tests/utils.py
++++ moban-0.8.2/tests/utils.py
+@@ -5,7 +5,7 @@ from textwrap import dedent
+ 
+ import fs
+ import pytest
+-from mock import patch
++from unittest.mock import patch
+ from fs.opener.parse import parse_fs_url
+ 
+ from moban.main import main

stop-using-jinja-extensions.patch

@@ -0,0 +1,12 @@
+Index: moban-0.8.2/docs/level-12-use-template-engine-extensions/.moban.yml
+===================================================================
+--- moban-0.8.2.orig/docs/level-12-use-template-engine-extensions/.moban.yml
++++ moban-0.8.2/docs/level-12-use-template-engine-extensions/.moban.yml
+@@ -3,7 +3,6 @@ targets:
+   - b.output: b.template
+ extensions:
+   jinja2:
+-    - jinja2.ext.with_
+     - filter:moban.externals.file_system.url_join
+     - test:moban.externals.file_system.exists
+     - global:description=moban.constants.PROGRAM_DESCRIPTION