Remove deprecated command 'build_rst_docs'

... has been removed in favor of 'build_base_docs'.

[ChangeLog][PySide6] 'build_rst_docs' has been removed in favor of
'build_base_docs'.

Fixes: PYSIDE-2504
Change-Id: I2abcd6d1cef8c6b6095c9f25500380adc748ab83
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

3 files changed, 5 insertions, 13 deletions

diff --git a/build_scripts/main.py b/build_scripts/main.py
index bf71f9962..9a8d4fb3f 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -1200,10 +1200,6 @@ class PysideBaseDocs(Command, CommandMixin):
     user_options = CommandMixin.mixin_user_options
 
     def __init__(self, *args, **kwargs):
-        if args[0].commands[0] == "build_rst_docs":
-            args[0].commands[0] = "build_base_docs"
-            log.warning("'build_rst_docs' is deprecated and will be removed. "
-                        "Please use 'build_base_docs' instead.")
         self.command_name = "build_base_docs"
         Command.__init__(self, *args, **kwargs)
         CommandMixin.__init__(self)
@@ -1316,8 +1312,6 @@ cmd_class_dict = {
     'install': PysideInstall,
     'install_lib': PysideInstallLib,
     'build_base_docs': PysideBaseDocs,
-    # TODO: Remove build_rst_docs in the next version, see PYSIDE-2504
-    'build_rst_docs': PysideBaseDocs,
 }
 if wheel_module_exists:
     pyside_bdist_wheel = get_bdist_wheel_override()
diff --git a/build_scripts/options.py b/build_scripts/options.py
index bfaf03262..806d4a8a3 100644
--- a/build_scripts/options.py
+++ b/build_scripts/options.py
@@ -123,8 +123,7 @@ def _jobs_option_value():
 
 def find_qtpaths():
     # for these command --qtpaths should not be required
-    no_qtpaths_commands = ["--help", "--help-commands", "--qt-target-path", "build_base_docs",
-                           "build_rst_docs"]
+    no_qtpaths_commands = ["--help", "--help-commands", "--qt-target-path", "build_base_docs"]
 
     for no_qtpaths_command in no_qtpaths_commands:
         if any(no_qtpaths_command in argument for argument in sys.argv):
@@ -461,7 +460,7 @@ class CommandMixin(object):
                        qt_target_path=qt_target_path,
                        cmake_toolchain_file=cmake_toolchain_file)
 
-        if 'build_base_docs' not in sys.argv and 'build_rst_docs' not in sys.argv:
+        if 'build_base_docs' not in sys.argv:
             try:
                 QtInfo().prefix_dir
             except Exception as e:
@@ -551,9 +550,8 @@ class CommandMixin(object):
         # while cross-compiling.
         # Skip this process for the 'build_base_docs' command
         if (not self.is_cross_compile
-                and not self.qt_target_path
-                and 'build_base_docs' not in sys.argv
-                and 'build_rst_docs' not in sys.argv):
+            and not self.qt_target_path
+                and 'build_base_docs' not in sys.argv):
             # Enforce usage of qmake in QtInfo if it was given explicitly.
             if self.qmake:
                 self.has_qmake_option = True
diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py
index 9bcbb4afe..5d0466247 100644
--- a/build_scripts/setup_runner.py
+++ b/build_scripts/setup_runner.py
@@ -93,7 +93,7 @@ class SetupRunner(object):
                 setup_cmd.append(self.construct_cmd_line_argument(name, value))
 
         # Add --reuse-build option if requested and not already present.
-        if (reuse_build and command in ('bdist_wheel', 'build', 'build_base_docs', 'build_rst_docs', 'install')
+        if (reuse_build and command in ('bdist_wheel', 'build', 'build_base_docs', 'install')
                 and not self.cmd_line_argument_is_in_args("reuse-build", modified_argv)):
             setup_cmd.append(self.construct_cmd_line_argument("reuse-build"))
         return setup_cmd