diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index 98c442139dca..609e6c12288d 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp310 = { - hash = "sha256-YlQ2hoW5MjQkOJ4L2/GsomlyX3rkNDjdC82hZ0RwzGw="; + hash = "sha256-cHxgTJS5t5nQXi//EWtyUHhGelZbbd5mOs9cegeaj58="; }; cp311 = { - hash = "sha256-VhbwU8sSccbuybGCPGeEF+lXv9fGGtVs1+e4S5vOURI="; + hash = "sha256-+rj/xdcVHe23UOzZ6YbTq7ULMgYTyjeN5peNoa3NMVc="; }; cp312 = { - hash = "sha256-EYug39E5RXG8W8x7aQTajcbFmvq8FZiXxdiSKV3htBE="; + hash = "sha256-4GWQJp0OUjt2X+Hw+E0HpWv04TN8HlSkIoEHsHIrfe0="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 69fbb8cae968..9430001fff90 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -1,58 +1,62 @@ { + lib, + buildPythonPackage, + pythonOlder, + pythonAtLeast, + python, + fetchPypi, + autoPatchelfHook, + + # dependencies aiohttp, aiohttp-cors, - aiorwlock, aiosignal, attrs, - autoPatchelfHook, - buildPythonPackage, - fetchPypi, click, cloudpickle, colorama, colorful, cython, - dm-tree, - fastapi, filelock, frozenlist, - fsspec, gpustat, grpcio, - gym, jsonschema, - lib, - lz4, - matplotlib, msgpack, numpy, opencensus, packaging, - pandas, - py-spy, prometheus-client, psutil, - pyarrow, pydantic, - python, - pythonAtLeast, - pythonOlder, + py-spy, pyyaml, requests, - scikit-image, - scipy, setproctitle, smart-open, + virtualenv, + + # optional-dependencies + fsspec, + pandas, + pyarrow, + dm-tree, + gym, + lz4, + matplotlib, + scikit-image, + scipy, + aiorwlock, + fastapi, starlette, + uvicorn, tabulate, tensorboardx, - uvicorn, - virtualenv, }: let pname = "ray"; - version = "2.32.0"; + version = "2.33.0"; in buildPythonPackage rec { inherit pname version; @@ -76,39 +80,6 @@ buildPythonPackage rec { // binary-hash ); - passthru.optional-dependencies = rec { - data-deps = [ - pandas - pyarrow - fsspec - ]; - - serve-deps = [ - aiorwlock - fastapi - pandas - starlette - uvicorn - ]; - - tune-deps = [ - tabulate - tensorboardx - ]; - - rllib-deps = tune-deps ++ [ - dm-tree - gym - lz4 - matplotlib - scikit-image - pyyaml - scipy - ]; - - air-deps = data-deps ++ serve-deps ++ tune-deps ++ rllib-deps; - }; - nativeBuildInputs = [ autoPatchelfHook ]; @@ -121,10 +92,10 @@ buildPythonPackage rec { ]; dependencies = [ - attrs aiohttp aiohttp-cors aiosignal + attrs click cloudpickle colorama @@ -139,10 +110,10 @@ buildPythonPackage rec { numpy opencensus packaging - py-spy prometheus-client psutil pydantic + py-spy pyyaml requests setproctitle @@ -150,6 +121,35 @@ buildPythonPackage rec { virtualenv ]; + optional-dependencies = rec { + air-deps = data-deps ++ serve-deps ++ tune-deps ++ rllib-deps; + data-deps = [ + fsspec + pandas + pyarrow + ]; + rllib-deps = tune-deps ++ [ + dm-tree + gym + lz4 + matplotlib + pyyaml + scikit-image + scipy + ]; + serve-deps = [ + aiorwlock + fastapi + pandas + starlette + uvicorn + ]; + tune-deps = [ + tabulate + tensorboardx + ]; + }; + postInstall = '' chmod +x $out/${python.sitePackages}/ray/core/src/ray/{gcs/gcs_server,raylet/raylet} '';