1 |
commit: a2c09cbf0b3d82b3aac2f5b4ad0d9012ffd971a5 |
2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 1 23:38:54 2022 +0000 |
4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 2 00:48:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c09cbf |
7 |
|
8 |
app-admin/ansible-lint: add 6.5.2, drop 6.5.1 |
9 |
|
10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
11 |
|
12 |
app-admin/ansible-lint/Manifest | 2 +- |
13 |
...lint-6.5.1.ebuild => ansible-lint-6.5.2.ebuild} | 2 +- |
14 |
.../ansible-lint-6.5.2_test-module-check.patch | 32 ++++++++++++++++++++++ |
15 |
3 files changed, 34 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest |
18 |
index b0e3cc496c55..6df1669c4d41 100644 |
19 |
--- a/app-admin/ansible-lint/Manifest |
20 |
+++ b/app-admin/ansible-lint/Manifest |
21 |
@@ -1,2 +1,2 @@ |
22 |
DIST ansible-lint-6.4.0.gh.tar.gz 235346 BLAKE2B a2f55e6f4df739dccb011225f0a660978a9dfdbcc6e45cee2eef12467482c471d8700bb1bfad87e03eb1c4f21291307db5dc174e2440370ca11368f6ad6d195d SHA512 75e30a325a5c62f64066925b99e691886e299e029adc78fdceaa5eb23a74a46408793479e7c54c312d93e0a62d190b34f1e7614dec31a94822d39a231796e9df |
23 |
-DIST ansible-lint-6.5.1.gh.tar.gz 244320 BLAKE2B aff13d6ce9346dbdba459722cfc071b1e671dc17f3fb44744a706097f29e2a6a9962514fc61e669b58517acf6e95feba88af1bf8c7a4fb668e1a8d1cc5d54746 SHA512 40890a3fc0caaa3fd1d38f32739615dd664db1e7ea534c0bc3138da7295cdc6923715ea12febefc8951be350aad5bf7ac76dd004e3c4aff386b78551bd6442a8 |
24 |
+DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5 |
25 |
|
26 |
diff --git a/app-admin/ansible-lint/ansible-lint-6.5.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild |
27 |
similarity index 98% |
28 |
rename from app-admin/ansible-lint/ansible-lint-6.5.1.ebuild |
29 |
rename to app-admin/ansible-lint/ansible-lint-6.5.2.ebuild |
30 |
index 117da9fdcf9e..ba4605d1720d 100644 |
31 |
--- a/app-admin/ansible-lint/ansible-lint-6.5.1.ebuild |
32 |
+++ b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild |
33 |
@@ -39,7 +39,7 @@ BDEPEND=" |
34 |
)" |
35 |
|
36 |
PATCHES=( |
37 |
- "${FILESDIR}"/${PN}-6.0.2_test-module-check.patch |
38 |
+ "${FILESDIR}"/${PN}-6.5.2_test-module-check.patch |
39 |
) |
40 |
|
41 |
# Skip problematic tests: |
42 |
|
43 |
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch |
44 |
new file mode 100644 |
45 |
index 000000000000..8e6cb512b633 |
46 |
--- /dev/null |
47 |
+++ b/app-admin/ansible-lint/files/ansible-lint-6.5.2_test-module-check.patch |
48 |
@@ -0,0 +1,32 @@ |
49 |
+Let the package managers handle dependencies, m'kay? |
50 |
+ |
51 |
+--- a/conftest.py |
52 |
++++ b/conftest.py |
53 |
+@@ -7,27 +7,6 @@ |
54 |
+ import pytest |
55 |
+ from ansible.module_utils.common.yaml import HAS_LIBYAML |
56 |
+ |
57 |
+-# checking if user is running pytest without installing test dependencies: |
58 |
+-missing = [] |
59 |
+-for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]: |
60 |
+- if not importlib.util.find_spec(module): |
61 |
+- missing.append(module) |
62 |
+-if missing: |
63 |
+- print( |
64 |
+- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'", |
65 |
+- file=sys.stderr, |
66 |
+- ) |
67 |
+- sys.exit(1) |
68 |
+- |
69 |
+-if not HAS_LIBYAML: |
70 |
+- # While presence of libyaml is not required for runtime, we keep this error |
71 |
+- # fatal here in order to be sure that we spot libyaml errors during testing. |
72 |
+- print( |
73 |
+- "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.", |
74 |
+- file=sys.stderr, |
75 |
+- ) |
76 |
+- sys.exit(1) |
77 |
+- |
78 |
+ |
79 |
+ os.environ["NO_COLOR"] = "1" |
80 |
+ |