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.

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

Widening range of grpcio versions allowed. #28623

Merged
merged 7 commits into from
Sep 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions python/ray/tests/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ py_test_module_list(
files = [
"test_actor_pool.py",
"test_async.py",
"test_asyncio.py",
"test_actor_failures.py",
"test_actor_resources.py",
"test_actor_lifetime.py",
Expand Down Expand Up @@ -122,15 +123,13 @@ py_test_module_list(
"test_multi_node_2.py",
"test_multinode_failures.py",
"test_multinode_failures_2.py",
"test_multiprocessing.py",
"test_object_assign_owner.py",
"test_placement_group.py",
"test_placement_group_2.py",
"test_placement_group_4.py",
"test_placement_group_5.py",
"test_ray_init.py",
"test_ray_init_2.py",
"test_reference_counting.py",
"test_resource_demand_scheduler.py",
"test_runtime_context.py",
"test_runtime_env_env_vars.py",
Expand All @@ -154,6 +153,7 @@ py_test_module_list(
"test_namespace.py",
"test_scheduling.py",
"test_traceback.py",
"test_queue.py",
],
size = "medium",
tags = ["exclusive", "medium_size_python_tests_k_to_z", "team:core"],
Expand All @@ -165,7 +165,6 @@ py_test_module_list(
"test_autoscaler_fake_multinode.py", # Temporarily owned by core.
"test_args.py",
"test_asyncio_cluster.py",
"test_asyncio.py",
"test_concurrency_group.py",
"test_component_failures.py",
"test_debug_tools.py",
Expand All @@ -174,7 +173,6 @@ py_test_module_list(
"test_mini.py",
"test_node_manager.py",
"test_numba.py",
"test_queue.py",
"test_ray_shutdown.py",
"test_unhandled_error.py",
"test_top_level_api.py",
Expand Down Expand Up @@ -300,6 +298,8 @@ py_test_module_list(
"test_placement_group_mini_integration.py",
"test_scheduling_2.py",
"test_multi_node_3.py",
"test_multiprocessing.py",
"test_reference_counting.py",
],
size = "large",
tags = ["exclusive", "large_size_python_tests_shard_1", "team:core"],
Expand Down
7 changes: 4 additions & 3 deletions python/ray/tests/test_runtime_env_working_dir_3.py
Original file line number Diff line number Diff line change
Expand Up @@ -457,9 +457,10 @@ def f():
print("Starting Internal KV checks at time ", time.time() - start)
if expiration_s > 0:
assert not check_internal_kv_gced()
wait_for_condition(check_internal_kv_gced, timeout=2 * expiration_s)
assert expiration_s < time.time() - start < 2 * expiration_s
print("Internal KV was GC'ed at time ", time.time() - start)
wait_for_condition(check_internal_kv_gced, timeout=4 * expiration_s)
time_until_gc = time.time() - start
assert expiration_s < time_until_gc < 4 * expiration_s
print("Internal KV was GC'ed at time ", time_until_gc)
else:
wait_for_condition(check_internal_kv_gced)
print("Internal KV was GC'ed at time ", time.time() - start)
Expand Down
7 changes: 4 additions & 3 deletions python/ray/tests/test_scheduling.py
Original file line number Diff line number Diff line change
Expand Up @@ -737,11 +737,12 @@ def condition():

return condition

wait_for_condition(make_condition(2))
# timeout=60 necessary to pass on windows debug/asan builds.
wait_for_condition(make_condition(2), timeout=60)
start_infeasible.remote(2)
wait_for_condition(make_condition(3))
wait_for_condition(make_condition(3), timeout=60)
start_infeasible.remote(4)
wait_for_condition(make_condition(4))
wait_for_condition(make_condition(4), timeout=60)


if __name__ == "__main__":
Expand Down
4 changes: 2 additions & 2 deletions python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cloudpickle
filelock
frozenlist
gpustat == 1.0.0b1
grpcio >= 1.32.0, <= 1.43.0; python_version < '3.10'
grpcio >= 1.42.0, <= 1.43.0; python_version >= '3.10'
grpcio >= 1.32.0, <= 1.48.1; python_version < '3.10'
cadedaniel marked this conversation as resolved.
Show resolved Hide resolved
grpcio >= 1.42.0, <= 1.48.1; python_version >= '3.10'
jsonschema
msgpack >= 1.0.0, < 2.0.0
numpy >= 1.16
Expand Down
4 changes: 2 additions & 2 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ def get_packages(self):
"click >= 7.0, <= 8.0.4",
"dataclasses; python_version < '3.7'",
"filelock",
"grpcio >= 1.32.0, <= 1.43.0; python_version < '3.10'",
"grpcio >= 1.42.0, <= 1.43.0; python_version >= '3.10'",
"grpcio >= 1.32.0, <= 1.48.1; python_version < '3.10'",
"grpcio >= 1.42.0, <= 1.48.1; python_version >= '3.10'",
"jsonschema",
"msgpack >= 1.0.0, < 2.0.0",
"numpy >= 1.16; python_version < '3.9'",
Expand Down