[gentoo-commits] repo/gentoo:master commit in: dev-util/cookiecutter/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/cookiecutter/files/

[Conrad Kostecki]

commit:     4e18941dfc42036c84be0af2aa6f6184119c7257
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jul  8 08:50:06 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 18:05:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e18941d

dev-util/cookiecutter: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31799
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../cookiecutter-2.0.2-fix-path-in-test.patch      | 13 -------------
 ...cookiecutter-2.0.2-relax-click-dependency.patch | 22 ----------------------
 2 files changed, 35 deletions(-)

diff --git a/dev-util/cookiecutter/files/cookiecutter-2.0.2-fix-path-in-test.patch b/dev-util/cookiecutter/files/cookiecutter-2.0.2-fix-path-in-test.patch
deleted file mode 100644
index 569ca97e5e42..000000000000
--- a/dev-util/cookiecutter/files/cookiecutter-2.0.2-fix-path-in-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/test_generate_file.py b/tests/test_generate_file.py
-index 2ca30df..47e14ec 100644
---- a/tests/test_generate_file.py
-+++ b/tests/test_generate_file.py
-@@ -118,7 +118,7 @@ def expected_msg():
-     """Fixture. Used to ensure that exception generated text contain full data."""
-     msg = (
-         'Missing end of comment tag\n'
--        '  File "./tests/files/syntax_error.txt", line 1\n'
-+        '  File "tests/files/syntax_error.txt", line 1\n'
-         '    I eat {{ syntax_error }} {# this comment is not closed}'
-     )
-     return msg.replace("/", os.sep)

diff --git a/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch b/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch
deleted file mode 100644
index 1ce7ea09f68b..000000000000
--- a/dev-util/cookiecutter/files/cookiecutter-2.0.2-relax-click-dependency.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 931dded761400c99ab70a1469e9c6e1c9abdcb8c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20La=C5=84ski?= <jakub.lanski@gmail.com>
-Date: Fri, 21 Jan 2022 07:11:57 +0100
-Subject: [PATCH] Restore accidentally deleted support for click 8.x
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 654010fa..d703c3c2 100644
---- a/setup.py
-+++ b/setup.py
-@@ -10,7 +10,7 @@
- requirements = [
-     'binaryornot>=0.4.4',
-     'Jinja2>=2.7,<4.0.0',
--    'click>=7.0,<8.0.0',
-+    'click>=7.0,<9.0.0',
-     'pyyaml>=5.3.1',
-     'jinja2-time>=0.2.0',
-     'python-slugify>=4.0.0',