Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dependency] Allow latest ray version on local machine #2401

Merged
merged 5 commits into from
Aug 15, 2023
Merged

[Dependency] Allow latest ray version on local machine #2401

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
947798f
Allow latest ray version on local machine
Michaelvll Aug 14, 2023
31908bc
Remove mac version check
Michaelvll Aug 14, 2023
610b277
Merge branch 'master' of github.com:skypilot-org/skypilot into allow-…
Michaelvll Aug 15, 2023
edc66aa
Add comment
Michaelvll Aug 15, 2023
c76fc2f
Fix typo
Michaelvll Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions sky/setup_files/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@
ROOT_DIR = os.path.dirname(__file__)

system = platform.system()
if system == 'Darwin':
mac_version = platform.mac_ver()[0]
mac_major, mac_minor = mac_version.split('.')[:2]
mac_major = int(mac_major)
mac_minor = int(mac_minor)
if mac_major < 10 or (mac_major == 10 and mac_minor < 15):
warnings.warn(
f'\'Detected MacOS version {mac_version}. MacOS version >=10.15 '
'is required to install ray>=1.9\'')


def find_version(*filepath):
Expand Down Expand Up @@ -69,33 +60,35 @@ def parse_readme(readme: str) -> str:
# docs display weird blockquotes.
# TODO(zongheng): investigate how to make click 8.1.x display nicely and
# remove the upper bound.
'click<=8.0.4,>=7.0',
'click <= 8.0.4, >= 7.0',
# NOTE: required by awscli. To avoid ray automatically installing
# the latest version.
'colorama<0.4.5',
'colorama < 0.4.5',
'cryptography',
# Jinja has a bug in older versions because of the lack of pinning
# the version of the underlying markupsafe package. See:
# https://github.com/pallets/jinja/issues/1585
'jinja2>=3.0',
'jinja2 >= 3.0',
'jsonschema',
'networkx',
'oauth2client',
'pandas',
'pendulum',
# PrettyTable with version >=2.0.0 is required for the support of
# `add_rows` method.
'PrettyTable>=2.0.0',
'PrettyTable >= 2.0.0',
'python-dotenv',
# Lower version of ray will cause dependency conflict for
# click/grpcio/protobuf.
'ray[default]>=2.2.0,<=2.4.0',
# Excluded 2.6.0 as it has a bug in the cluster launcher:
# https://github.com/ray-project/ray/releases/tag/ray-2.6.1
'ray[default] >= 2.2.0, <= 2.6.3, != 2.6.0',
'rich',
'tabulate',
# Light weight requirement, can be replaced with "typing" once
# we deprecate Python 3.7 (this will take a while).
"typing_extensions; python_version < '3.8'",
'filelock>=3.6.0',
'filelock >= 3.6.0',
# Adopted from ray's setup.py: https://github.com/ray-project/ray/blob/ray-2.4.0/python/setup.py
# SkyPilot: != 1.48.0 is required to avoid the error where ray dashboard fails to start when
# ray start is called (#2054).
Expand All @@ -113,7 +106,9 @@ def parse_readme(readme: str) -> str:
'pulp',
# Ray job has an issue with pydantic>2.0.0, due to API changes of pydantic. See
# https://github.com/ray-project/ray/issues/36990
'pydantic<2.0',
# >=1.10.8 is needed for ray>=2.6. See
# https://github.com/ray-project/ray/issues/35661
'pydantic <2.0, >=1.10.8',
# Cython 3.0 release breaks PyYAML installed by aws-cli.
# https://github.com/yaml/pyyaml/issues/601
# https://github.com/aws/aws-cli/issues/8036
Expand Down