update ray patch

Author: qunaibit

graalpython/lib-graalpython/patches/ray/ray-2.9.1.patch

@@ -40,6 +40,57 @@ index 1dfaaca..6eeb618 100644
  import grpc  # noqa: F401
 
  # Adding new modules should also be reflected in the
+diff --git a/doc/requirements-doc.txt b/doc/requirements-doc.txt
+index f96158b..f584ac3 100644
+--- a/doc/requirements-doc.txt
++++ b/doc/requirements-doc.txt
+@@ -1,6 +1,6 @@
+ # Production requirements. This is what readthedocs.com picks up
+ 
+-watchfiles==0.19.0 # Required because sphinx-click doesn't support mocking
++# watchfiles==0.19.0 # Required because sphinx-click doesn't support mocking
+ 
+ # Syntax highlighting
+ Pygments==2.16.1
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 477c25d..6a6c2f4 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -496,7 +496,7 @@ autodoc_mock_imports = [
+     "tree",
+     "uvicorn",
+     "wandb",
+-    "watchfiles",
++    # "watchfiles",
+     "xgboost",
+     "xgboost_ray",
+     "psutil",
+diff --git a/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt b/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt
+index ddcddd7..25492db 100644
+--- a/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt
++++ b/doc/source/ray-overview/pip_freeze_ray-ml-py39-cpu.txt
+@@ -459,7 +459,7 @@ uvicorn==0.22.0
+ uvloop==0.19.0
+ virtualenv==20.21.0
+ wandb==0.13.4
+-watchfiles==0.19.0
++# watchfiles==0.19.0
+ wcwidth==0.2.12
+ webcolors==1.13
+ webencodings==0.5.1
+diff --git a/doc/source/ray-overview/pip_freeze_ray-py39-cpu.txt b/doc/source/ray-overview/pip_freeze_ray-py39-cpu.txt
+index 8f56dcb..e14a213 100644
+--- a/doc/source/ray-overview/pip_freeze_ray-py39-cpu.txt
++++ b/doc/source/ray-overview/pip_freeze_ray-py39-cpu.txt
+@@ -154,7 +154,7 @@ urllib3 @ file:///croot/urllib3_1698257533958/work
+ uvicorn==0.22.0
+ uvloop==0.19.0
+ virtualenv==20.21.0
+-watchfiles==0.19.0
++# watchfiles==0.19.0
+ wcwidth==0.2.12
+ websockets==11.0.3
+ yarl==1.9.3
 diff --git a/pyproject.toml b/pyproject.toml
 new file mode 100644
 index 0000000..d69f0ac
@@ -50,6 +101,28 @@ index 0000000..d69f0ac
 +requires = ["setuptools >= 40.6.0", "wheel", "pip", "psutil", "setproctitle==1.2.2", "colorama", "aiohttp"]
 +build-backend = "ray_build_backend"
 +backend-path = ["."]
+diff --git a/python/ray/_private/function_manager.py b/python/ray/_private/function_manager.py
+index bee0ae6..ee0e3ea 100644
+--- a/python/ray/_private/function_manager.py
++++ b/python/ray/_private/function_manager.py
+@@ -266,7 +266,7 @@ class FunctionActorManager:
+                 "function_name": remote_function._function_name,
+                 "module": function.__module__,
+                 "function": pickled_function,
+-                "collision_identifier": self.compute_collision_identifier(function),
++                # "collision_identifier": self.compute_collision_identifier(function),  # code object is missing attribute '_varname_from_oparg'
+                 "max_calls": remote_function._max_calls,
+             }
+         )
+@@ -524,7 +524,7 @@ class FunctionActorManager:
+             "module": actor_creation_function_descriptor.module_name,
+             "class": serialized_actor_class,
+             "job_id": job_id.binary(),
+-            "collision_identifier": self.compute_collision_identifier(Class),
++            # "collision_identifier": self.compute_collision_identifier(Class), # code object is missing attribute '_varname_from_oparg'
+             "actor_method_names": json.dumps(list(actor_method_names)),
+         }
+ 
 diff --git a/python/ray/_private/services.py b/python/ray/_private/services.py
 index 867b748..40b3fb2 100644
 --- a/python/ray/_private/services.py
@@ -80,11 +153,91 @@ index 9c67ec6..12fda5a 100644
 
 
  def _extract_class_dict(cls):
+diff --git a/python/ray/serve/scripts.py b/python/ray/serve/scripts.py
+index 630ab7a..e95bcd6 100644
+--- a/python/ray/serve/scripts.py
++++ b/python/ray/serve/scripts.py
+@@ -9,7 +9,7 @@ from dataclasses import asdict
+ from typing import Dict, List, Optional, Tuple
+ 
+ import click
+-import watchfiles
++# import watchfiles
+ import yaml
+ 
+ import ray
+diff --git a/python/requirements.txt b/python/requirements.txt
+index af77b05..f605240 100644
+--- a/python/requirements.txt
++++ b/python/requirements.txt
+@@ -17,7 +17,7 @@ pyyaml
+ aiosignal
+ frozenlist
+ requests
+-watchfiles
++# watchfiles
+ 
+ # Python version-specific requirements
+ grpcio == 1.54.2; sys_platform == "darwin"
+@@ -58,6 +58,7 @@ starlette
+ typer
+ fsspec
+ pandas>=1.3
+-pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3  # Serve users can use pydantic<2
++# pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3  # Serve users can use pydantic<2
++pydantic==2.4.2
+ py-spy>=0.2.0
+-watchfiles
++# watchfiles
+diff --git a/python/requirements/test-requirements.txt b/python/requirements/test-requirements.txt
+index c87c1de..29d7c7f 100644
+--- a/python/requirements/test-requirements.txt
++++ b/python/requirements/test-requirements.txt
+@@ -112,4 +112,4 @@ threadpoolctl==3.1.0
+ numexpr==2.8.4
+ 
+ # For `serve run --reload` CLI.
+-watchfiles==0.19.0
++# watchfiles==0.19.0
 diff --git a/python/setup.py b/python/setup.py
-index a34a39c..6ac7ac5 100644
+index a34a39c..51a1a17 100644
 --- a/python/setup.py
 +++ b/python/setup.py
-@@ -535,19 +535,19 @@ def build(build_python, build_java, build_cpp):
+@@ -251,7 +251,8 @@ if setup_spec.type == SetupType.RAY:
+             "grpcio >= 1.32.0; python_version < '3.10'",  # noqa:E501
+             "grpcio >= 1.42.0; python_version >= '3.10'",  # noqa:E501
+             "opencensus",
+-            "pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3",
++            # "pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3",
++            "pydantic",
+             "prometheus_client >= 0.7.1",
+             "smart_open",
+             "virtualenv >=20.0.24, !=20.21.1",  # For pip runtime env.
+@@ -264,12 +265,12 @@ if setup_spec.type == SetupType.RAY:
+             else "grpcio",
+         ],
+         "serve": [
+-            "uvicorn[standard]",
++            # "uvicorn[standard]", # needs watchfiles
+             "requests",
+             "starlette",
+             "fastapi",
+             "aiorwlock",
+-            "watchfiles",
++            # "watchfiles", # requires PyO3 patch (require embadding)
+         ],
+         "tune": ["pandas", "tensorboardX>=1.9", "requests", pyarrow_dep, "fsspec"],
+         "observability": [
+@@ -520,7 +521,7 @@ def build(build_python, build_java, build_cpp):
+     # version of Python to build packages inside the build.sh script. Note
+     # that certain flags will not be passed along such as --user or sudo.
+     # TODO(rkn): Fix this.
+-    if not os.getenv("SKIP_THIRDPARTY_INSTALL"):
++    if not os.getenv("SKIP_THIRDPARTY_INSTALL") and False:
+         pip_packages = ["psutil", "setproctitle==1.2.2", "colorama"]
+         subprocess.check_call(
+             [
+@@ -535,19 +536,19 @@ def build(build_python, build_java, build_cpp):
              env=dict(os.environ, CC="gcc"),
          )