From 94010032d669da159ad435970e9d4006c1cdeebd Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <vkarak@gmail.com>
Date: Fri, 9 Dec 2022 00:07:59 +0100
Subject: [PATCH] Remove deprecated `--ignore-check-conflicts` option

---
 reframe/core/hooks.py       |  4 ++++
 reframe/frontend/cli.py     | 13 -------------
 reframe/schemas/config.json |  2 --
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/reframe/core/hooks.py b/reframe/core/hooks.py
index cb00007bb4..ab7b8da653 100644
--- a/reframe/core/hooks.py
+++ b/reframe/core/hooks.py
@@ -59,6 +59,10 @@ def require_deps(func):
           Using this functionality from the :py:mod:`reframe` or
           :py:mod:`reframe.core.decorators` modules is now deprecated. You
           should use the built-in function described here.
+
+       .. versionchanged:: 4.0.0
+          You may only use this function as framework built-in.
+
     '''
 
     tests = inspect.getfullargspec(func).args[1:]
diff --git a/reframe/frontend/cli.py b/reframe/frontend/cli.py
index 0aa6a63705..75e7386539 100644
--- a/reframe/frontend/cli.py
+++ b/reframe/frontend/cli.py
@@ -282,13 +282,6 @@ def main():
         help="Add PATH to the check search path list",
         envvar='RFM_CHECK_SEARCH_PATH :', configvar='general/check_search_path'
     )
-    locate_options.add_argument(
-        '--ignore-check-conflicts', action='store_true',
-        help=('Skip checks with conflicting names '
-              '(this option is deprecated and has no effect)'),
-        envvar='RFM_IGNORE_CHECK_CONFLICTS',
-        configvar='general/ignore_check_conflicts'
-    )
     locate_options.add_argument(
         '-R', '--recursive', action='store_true',
         help='Search for checks in the search path recursively',
@@ -760,12 +753,6 @@ def restrict_logging():
         printer.info(logfiles_message())
         sys.exit(1)
 
-    if site_config.get('general/0/ignore_check_conflicts'):
-        logging.getlogger().warning(
-            "the 'ignore_check_conflicts' option is deprecated "
-            "and will be removed in the future"
-        )
-
     rt = runtime.runtime()
     try:
         if site_config.get('general/0/module_map_file'):
diff --git a/reframe/schemas/config.json b/reframe/schemas/config.json
index 65806d49fb..59a8af87da 100644
--- a/reframe/schemas/config.json
+++ b/reframe/schemas/config.json
@@ -486,7 +486,6 @@
                     "colorize": {"type": "boolean"},
                     "compress_report": {"type": "boolean"},
                     "git_timeout": {"type": "number"},
-                    "ignore_check_conflicts": {"type": "boolean"},
                     "keep_stage_files": {"type": "boolean"},
                     "module_map_file": {"type": "string"},
                     "module_mappings": {
@@ -540,7 +539,6 @@
         "general/colorize": true,
         "general/compress_report": false,
         "general/git_timeout": 5,
-        "general/ignore_check_conflicts": false,
         "general/keep_stage_files": false,
         "general/module_map_file": "",
         "general/module_mappings": [],