diff --git a/python/ray/scripts/scripts.py b/python/ray/scripts/scripts.py index 3896816b8a40..3de7a6bec535 100644 --- a/python/ray/scripts/scripts.py +++ b/python/ray/scripts/scripts.py @@ -1,4 +1,3 @@ -import copy import json import logging import os @@ -2770,28 +2769,16 @@ def get_auth_token(generate): click.echo(token, nl=False) -def add_command_alias(command, name, hidden): - new_command = copy.deepcopy(command) - new_command.hidden = hidden - cli.add_command(new_command, name=name) - - cli.add_command(dashboard) cli.add_command(debug) cli.add_command(start) cli.add_command(stop) cli.add_command(up) -add_command_alias(up, name="create_or_update", hidden=True) cli.add_command(attach) cli.add_command(exec) -add_command_alias(exec, name="exec_cmd", hidden=True) -add_command_alias(rsync_down, name="rsync_down", hidden=True) -add_command_alias(rsync_up, name="rsync_up", hidden=True) cli.add_command(submit) cli.add_command(down) -add_command_alias(down, name="teardown", hidden=True) cli.add_command(kill_random_node) -add_command_alias(get_head_ip, name="get_head_ip", hidden=True) cli.add_command(get_worker_ips) cli.add_command(microbenchmark) cli.add_command(stack) @@ -2822,8 +2809,8 @@ def add_command_alias(command, name, hidden): cli.add_command(ray_list, name="list") cli.add_command(ray_get, name="get") - add_command_alias(summary_state_cli_group, name="summary", hidden=False) - add_command_alias(logs_state_cli_group, name="logs", hidden=False) + cli.add_command(summary_state_cli_group, name="summary") + cli.add_command(logs_state_cli_group, name="logs") except ImportError as e: logger.debug(f"Integrating ray state command line tool failed: {e}") @@ -2831,7 +2818,7 @@ def add_command_alias(command, name, hidden): try: from ray.dashboard.modules.job.cli import job_cli_group - add_command_alias(job_cli_group, name="job", hidden=False) + cli.add_command(job_cli_group, name="job") except Exception as e: logger.debug(f"Integrating ray jobs command line tool failed with {e}") diff --git a/python/requirements.txt b/python/requirements.txt index 08bab7335f12..ac13f72f2d67 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -7,9 +7,7 @@ # You can obtain this list from the ray.egg-info/requires.txt ## setup.py install_requires -# Click 8.3.* does not work with copy.deepcopy on Python 3.10 -# TODO(aslonnie): https://github.com/ray-project/ray/issues/56747 -click>=7.0, !=8.3.* +click>=7.0 cupy-cuda12x; sys_platform != 'darwin' filelock jsonschema diff --git a/python/setup.py b/python/setup.py index 7681efac52a5..ef8013d870a4 100644 --- a/python/setup.py +++ b/python/setup.py @@ -402,9 +402,7 @@ def get_packages(self): # new releases candidates. if setup_spec.type == SetupType.RAY: setup_spec.install_requires = [ - # Click 8.3.* does not work with copy.deepcopy on Python 3.10 - # TODO(aslonnie): https://github.com/ray-project/ray/issues/56747 - "click>=7.0, !=8.3.*", + "click>=7.0", "filelock", "jsonschema", "msgpack >= 1.0.0, < 2.0.0",