From f704f050bfdcc3bad4cd597edcce143ca6133848 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 6 Mar 2023 23:55:40 +0000 Subject: gentoo auto-resync : 06:03:2023 - 23:55:39 --- .../ansible-lint-6.8.1_test-module-check.patch | 43 ---------------- .../ansible-lint-6.8.6_test-module-check.patch | 59 ---------------------- 2 files changed, 102 deletions(-) delete mode 100644 app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch delete mode 100644 app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch (limited to 'app-admin/ansible-lint/files') diff --git a/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch deleted file mode 100644 index 8c2ca1a96503..000000000000 --- a/app-admin/ansible-lint/files/ansible-lint-6.8.1_test-module-check.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/conftest.py -+++ b/conftest.py -@@ -8,40 +8,6 @@ - import pytest - from ansible.module_utils.common.yaml import HAS_LIBYAML - --# checking if user is running pytest without installing test dependencies: --missing = [] --for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]: -- if not importlib.util.find_spec(module): -- missing.append(module) --if missing: -- print( -- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'", -- file=sys.stderr, -- ) -- sys.exit(1) --# we need to be sure that we have the requirements installed as some tests --# might depend on these. --try: -- subprocess.check_output( -- ["ansible-galaxy", "collection", "install", "-r", "requirements.yml"], -- stderr=subprocess.PIPE, -- text=True, -- ) --except subprocess.CalledProcessError as exc: -- print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr) -- sys.exit(1) -- --if not HAS_LIBYAML and sys.version_info >= (3, 9, 0): -- # While presence of libyaml is not required for runtime, we keep this error -- # fatal here in order to be sure that we spot libyaml errors during testing. -- # -- # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38. -- print( -- "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.", -- file=sys.stderr, -- ) -- sys.exit(1) -- - - os.environ["NO_COLOR"] = "1" - diff --git a/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch deleted file mode 100644 index 5302a54cc32e..000000000000 --- a/app-admin/ansible-lint/files/ansible-lint-6.8.6_test-module-check.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/conftest.py -+++ b/conftest.py -@@ -7,56 +7,6 @@ - - import pytest - --# checking if user is running pytest without installing test dependencies: --missing = [] --for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]: -- if not importlib.util.find_spec(module): -- missing.append(module) --if missing: -- print( -- f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'", -- file=sys.stderr, -- ) -- sys.exit(1) --# we need to be sure that we have the requirements installed as some tests --# might depend on these. --try: -- from ansible_compat.prerun import get_cache_dir -- -- cache_dir = get_cache_dir(".") -- subprocess.check_output( -- [ -- "ansible-galaxy", -- "collection", -- "install", -- "-p", -- f"{cache_dir}/collections", -- "-r", -- "requirements.yml", -- ], -- stderr=subprocess.PIPE, -- text=True, -- ) --except subprocess.CalledProcessError as exc: -- print(f"{exc}\n{exc.stderr}\n{exc.stdout}", file=sys.stderr) -- sys.exit(1) -- --# flake8: noqa: E402 --from ansible.module_utils.common.yaml import ( # pylint: disable=wrong-import-position -- HAS_LIBYAML, --) -- --if not HAS_LIBYAML and sys.version_info >= (3, 9, 0): -- # While presence of libyaml is not required for runtime, we keep this error -- # fatal here in order to be sure that we spot libyaml errors during testing. -- # -- # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38. -- print( -- "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.", -- file=sys.stderr, -- ) -- sys.exit(1) -- - - os.environ["NO_COLOR"] = "1" - -- cgit v1.2.3