Skip to content

Commit 42a8271

Browse files
elliot-barnelliot-barn
authored
[deps] unifying serve test deps (#63313)
unifying serve test dependencies - Updating requirements_compiled.txt & requirements_compiled_py3.13.txt to include serve-test-requirements.txt - Removing redundant serve test requirements that exist in ray deps --------- Signed-off-by: elliot-barn <elliot.barnwell@anyscale.com>
1 parent db33c04 commit 42a8271

11 files changed

Lines changed: 208 additions & 173 deletions

‎ci/ci.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ compile_pip_dependencies() {
4949
python/requirements/lint-requirements.txt \
5050
python/requirements/test-requirements.txt \
5151
python/requirements/cloud-requirements.txt \
52+
python/requirements/serve/serve-test-requirements.txt \
5253
python/requirements/docker/ray-docker-requirements.txt \
5354
python/requirements/ml/core-requirements.txt \
5455
python/requirements/ml/data-requirements.txt \
@@ -117,6 +118,7 @@ compile_313_pip_dependencies() {
117118
python/requirements/lint-requirements.txt \
118119
python/requirements/py313/test-requirements.txt \
119120
python/requirements/cloud-requirements.txt \
121+
python/requirements/serve/serve-test-requirements.txt \
120122
python/requirements/docker/ray-docker-requirements.txt \
121123
python/requirements/ml/py313/core-requirements.txt \
122124
python/requirements/ml/py313/data-requirements.txt \

‎ci/raydepsets/configs/ci_serve.depsets.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ depsets:
1212
depsets:
1313
- ray_img_depset_${PYTHON_SHORT}
1414
requirements:
15-
- python/requirements/serve/serve-requirements.txt
16-
- python/requirements/serve/haproxy-reqs.txt
15+
- python/requirements/serve/serve-test-requirements.txt
1716
constraints:
1817
- /tmp/ray-deps/requirements_compiled_py3.13.txt
1918
output: python/deplocks/ci/serve_base_depset_py${PYTHON_VERSION}.lock

‎python/deplocks/ci/serve_base_depset_py3.10.lock‎

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ aioboto3==12.1.0 \
1616
--hash=sha256:9f9e07261ddf3d6fec04dd8d5f5a55e0cb3250089f4282f7a60054495ad9699b
1717
# via
1818
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
19-
# -r python/requirements/serve/serve-requirements.txt
19+
# -r python/requirements/serve/serve-test-requirements.txt
2020
aiobotocore==2.8.0 \
2121
--hash=sha256:32e632fea387acd45416c2bbc03828ee2c2a66a7dc4bd3a9bcb808dea249c469 \
2222
--hash=sha256:f160497cef21cfffc1a8d4219eeb27bb7b243389c2d021a812b9c0e3fb8e2bd1
@@ -158,7 +158,6 @@ aiohttp==3.13.5 \
158158
--hash=sha256:fee86b7c4bd29bdaf0d53d14739b08a106fdda809ca5fe032a15f52fae5fe254
159159
# via
160160
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
161-
# -r python/requirements/serve/serve-requirements.txt
162161
# aiobotocore
163162
# aiohttp-cors
164163
# ray
@@ -205,7 +204,7 @@ anyio==4.13.0 \
205204
--hash=sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc
206205
# via
207206
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
208-
# -r python/requirements/serve/serve-requirements.txt
207+
# -r python/requirements/serve/serve-test-requirements.txt
209208
# gradio
210209
# httpx
211210
# starlette
@@ -586,7 +585,6 @@ click==8.3.2 \
586585
--hash=sha256:1924d2c27c5653561cd2cae4548d1406039cb79b858b747cfea24924bbc1616d
587586
# via
588587
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
589-
# -r python/requirements/serve/serve-requirements.txt
590588
# celery
591589
# click-didyoumean
592590
# click-plugins
@@ -747,7 +745,6 @@ fastapi==0.121.0 \
747745
--hash=sha256:8bdf1b15a55f4e4b0d6201033da9109ea15632cb76cf156e7b8b4019f2172106
748746
# via
749747
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
750-
# -r python/requirements/serve/serve-requirements.txt
751748
# gradio
752749
# ray
753750
fastrlock==0.8.3 ; sys_platform != 'darwin' \
@@ -1025,7 +1022,7 @@ gradio==5.50.0 \
10251022
--hash=sha256:d06770d57cdda9b703ef9cf767ac93a890a0e12d82679a310eef74203a3673f4
10261023
# via
10271024
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
1028-
# -r python/requirements/serve/serve-requirements.txt
1025+
# -r python/requirements/serve/serve-test-requirements.txt
10291026
gradio-client==1.14.0 \
10301027
--hash=sha256:9a2f5151978411e0f8b55a2d38cddd0a94491851149d14db4af96f5a09774825
10311028
# via
@@ -1164,7 +1161,6 @@ grpcio==1.76.0 \
11641161
--hash=sha256:ff8a59ea85a1f2191a0ffcc61298c571bc566332f82e5f5be1b83c9d8e668a62
11651162
# via
11661163
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
1167-
# -r python/requirements/serve/serve-requirements.txt
11681164
# ray
11691165
# tensorboard
11701166
# tensorflow
@@ -1297,7 +1293,7 @@ httpx==0.28.1 \
12971293
--hash=sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad
12981294
# via
12991295
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
1300-
# -r python/requirements/serve/serve-requirements.txt
1296+
# -r python/requirements/serve/serve-test-requirements.txt
13011297
# gradio
13021298
# gradio-client
13031299
# safehttpx
@@ -1982,7 +1978,7 @@ numexpr==2.14.1 \
19821978
--hash=sha256:fdd886f4b7dbaf167633ee396478f0d0aa58ea2f9e7ccc3c6431019623e8d68f
19831979
# via
19841980
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
1985-
# -r python/requirements/serve/serve-requirements.txt
1981+
# -r python/requirements/serve/serve-test-requirements.txt
19861982
numpy==2.2.6 \
19871983
--hash=sha256:038613e9fb8c72b0a41f025a7e4c3f0b7a1b5d768ece4796b674c8f3fe13efff \
19881984
--hash=sha256:0678000bb9ac1475cd454c6b8c799206af8107e310843532b04d49649c717a47 \
@@ -2041,7 +2037,6 @@ numpy==2.2.6 \
20412037
--hash=sha256:fee4236c876c4e8369388054d02d0e9bb84821feb1a64dd59e137e6511a551f8
20422038
# via
20432039
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
2044-
# -r python/requirements/serve/serve-requirements.txt
20452040
# cupy-cuda12x
20462041
# dm-tree
20472042
# gradio
@@ -2348,7 +2343,6 @@ packaging==26.1 \
23482343
--hash=sha256:f042152b681c4bfac5cae2742a55e103d27ab2ec0f3d88037136b6bfe7c9c5de
23492344
# via
23502345
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
2351-
# -r python/requirements/serve/serve-requirements.txt
23522346
# gradio
23532347
# gradio-client
23542348
# huggingface-hub
@@ -2420,7 +2414,6 @@ pandas==2.3.3 \
24202414
--hash=sha256:f8bfc0e12dc78f777f323f55c58649591b2cd0c43534e8355c51d3fede5f4dee
24212415
# via
24222416
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
2423-
# -r python/requirements/serve/serve-requirements.txt
24242417
# gradio
24252418
# ray
24262419
pillow==11.3.0 \
@@ -2708,7 +2701,6 @@ protobuf==5.29.6 \
27082701
--hash=sha256:da9ee6a5424b6b30fd5e45c5ea663aef540ca95f9ad99d1e887e819cdf9b8723 \
27092702
--hash=sha256:e3387f44798ac1106af0233c04fb8abf543772ff241169946f698b3a9a3d3ab9
27102703
# via
2711-
# -r python/requirements/serve/serve-requirements.txt
27122704
# google-api-core
27132705
# googleapis-common-protos
27142706
# opentelemetry-proto
@@ -2813,7 +2805,6 @@ pydantic==2.12.3 \
28132805
--hash=sha256:6986454a854bc3bc6e5443e1369e06a3a456af9d339eda45510f517d9ea5c6bf
28142806
# via
28152807
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
2816-
# -r python/requirements/serve/serve-requirements.txt
28172808
# fastapi
28182809
# gradio
28192810
# ray
@@ -2951,10 +2942,12 @@ pygments==2.18.0 \
29512942
# via
29522943
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
29532944
# rich
2954-
pymysql==1.1.2 \
2955-
--hash=sha256:4961d3e165614ae65014e361811a724e2044ad3ea3739de9903ae7c21f539f03 \
2956-
--hash=sha256:e6b1d89711dd51f8f74b1631fe08f039e7d76cf67a42a323d3178f0f25762ed9
2957-
# via -r python/requirements/serve/serve-requirements.txt
2945+
pymysql==1.1.3 \
2946+
--hash=sha256:8164ba62c552f6105f3b11753352d0f16b90d1703ba67d81923d5a8a5d1c5289 \
2947+
--hash=sha256:e70ebf2047a4edf6138cf79c68ad418ef620af65900aa585c5e8bfc95044d43a
2948+
# via
2949+
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
2950+
# -r python/requirements/serve/serve-test-requirements.txt
29582951
pyopenssl==25.1.0 \
29592952
--hash=sha256:2b11f239acc47ac2e5aca04fd7fa829800aeee22a2eb30d744572a157bd8a1ab \
29602953
--hash=sha256:8d031884482e0c67ee92bf9a4d8cceb08d92aba7136432ffb0703c5280fc205b
@@ -2966,14 +2959,14 @@ pytest==7.4.4 \
29662959
--hash=sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8
29672960
# via
29682961
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
2969-
# -r python/requirements/serve/serve-requirements.txt
2962+
# -r python/requirements/serve/serve-test-requirements.txt
29702963
# pytest-asyncio
29712964
pytest-asyncio==0.17.2 \
29722965
--hash=sha256:6d895b02432c028e6957d25fc936494e78c6305736e785d9fee408b1efbc7ff4 \
29732966
--hash=sha256:e0fe5dbea40516b661ef1bcfe0bd9461c2847c4ef4bb40012324f2454fb7d56d
29742967
# via
29752968
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
2976-
# -r python/requirements/serve/serve-requirements.txt
2969+
# -r python/requirements/serve/serve-test-requirements.txt
29772970
python-dateutil==2.9.0.post0 \
29782971
--hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
29792972
--hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
@@ -3082,7 +3075,6 @@ pyyaml==6.0.3 \
30823075
--hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0
30833076
# via
30843077
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3085-
# -r python/requirements/serve/serve-requirements.txt
30863078
# gradio
30873079
# huggingface-hub
30883080
# ray
@@ -3091,13 +3083,15 @@ pyyaml==6.0.3 \
30913083
ray-haproxy==2.8.20 \
30923084
--hash=sha256:a955cbb370c9b9a4dadecd265ddff3ac6d007ad70eae293f05ef753a22b5e1f2 \
30933085
--hash=sha256:da23d7d28c39247826466ddfe3c166db7cef5dcd44d8a64b8f9eb91e7089076c
3094-
# via -r python/requirements/serve/haproxy-reqs.txt
3086+
# via
3087+
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3088+
# -r python/requirements/serve/serve-test-requirements.txt
30953089
redis==4.5.4 \
30963090
--hash=sha256:2c19e6767c474f2e85167909061d525ed65bea9301c0770bb151e041b7ac89a2 \
30973091
--hash=sha256:73ec35da4da267d6847e47f68730fdd5f62e2ca69e3ef5885c6a78a9374c3893
30983092
# via
30993093
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3100-
# -r python/requirements/serve/serve-requirements.txt
3094+
# -r python/requirements/serve/serve-test-requirements.txt
31013095
# taskiq-redis
31023096
referencing==0.36.2 \
31033097
--hash=sha256:df2e89862cd09deabbdba16944cc3f10feb6b3e6f18e902f7cc25609a34775aa \
@@ -3229,7 +3223,6 @@ requests==2.33.1 \
32293223
--hash=sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a
32303224
# via
32313225
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3232-
# -r python/requirements/serve/serve-requirements.txt
32333226
# google-api-core
32343227
# huggingface-hub
32353228
# ray
@@ -3561,13 +3554,12 @@ sqlalchemy==2.0.49 \
35613554
--hash=sha256:fb37f15714ec2652d574f021d479e78cd4eb9d04396dca36568fdfffb3487982
35623555
# via
35633556
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3564-
# -r python/requirements/serve/serve-requirements.txt
3557+
# -r python/requirements/serve/serve-test-requirements.txt
35653558
starlette==0.49.3 \
35663559
--hash=sha256:1c14546f299b5901a1ea0e34410575bc33bbd741377a10484a54445588d00284 \
35673560
--hash=sha256:b579b99715fdc2980cf88c8ec96d3bf1ce16f5a8051a7c2b84ef9b1cdecaea2f
35683561
# via
35693562
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3570-
# -r python/requirements/serve/serve-requirements.txt
35713563
# fastapi
35723564
# gradio
35733565
# ray
@@ -3593,7 +3585,9 @@ taskiq-dependencies==1.5.7 \
35933585
taskiq-redis==0.4.0 \
35943586
--hash=sha256:61a01b8076a41730c1a1b7aa659f3bf703e4e7eb53a1e049bee02f0fa17177ae \
35953587
--hash=sha256:7b22d2028965878b9a0567b4eaf7ab939fbd985226d0936c1407846e9d5c523d
3596-
# via -r python/requirements/serve/serve-requirements.txt
3588+
# via
3589+
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3590+
# -r python/requirements/serve/serve-test-requirements.txt
35973591
tensorboard==2.20.0 \
35983592
--hash=sha256:9dc9f978cb84c0723acf9a345d96c184f0293d18f166bb8d59ee098e6cfaaba6
35993593
# via
@@ -3635,13 +3629,13 @@ tensorflow==2.20.0 \
36353629
--hash=sha256:e5f169f8f5130ab255bbe854c5f0ae152e93d3d1ac44f42cb1866003b81a5357
36363630
# via
36373631
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3638-
# -r python/requirements/serve/serve-requirements.txt
3632+
# -r python/requirements/serve/serve-test-requirements.txt
36393633
# tf-keras
36403634
tensorflow-probability==0.24.0 \
36413635
--hash=sha256:8c1774683e38359dbcaf3697e79b7e6a4e69b9c7b3679e78ee18f43e59e5759b
36423636
# via
36433637
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3644-
# -r python/requirements/serve/serve-requirements.txt
3638+
# -r python/requirements/serve/serve-test-requirements.txt
36453639
termcolor==3.3.0 \
36463640
--hash=sha256:348871ca648ec6a9a983a13ab626c0acce02f515b9e1983332b17af7979521c5 \
36473641
--hash=sha256:cf642efadaf0a8ebbbf4bc7a31cec2f9b5f21a9f726f4ccbb08192c9c26f43a5
@@ -3659,7 +3653,7 @@ tf-keras==2.20.0 \
36593653
--hash=sha256:73c547664679ed82da5b89466b9ea70da84dfe5a3a623ab59cd93ee5647165ee
36603654
# via
36613655
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3662-
# -r python/requirements/serve/serve-requirements.txt
3656+
# -r python/requirements/serve/serve-test-requirements.txt
36633657
tokenizers==0.15.2 \
36643658
--hash=sha256:0143e7d9dcd811855c1ce1ab9bf5d96d29bf5e528fd6c7824d0465741e8c10fd \
36653659
--hash=sha256:02272fe48280e0293a04245ca5d919b2c94a48b408b55e858feae9618138aeda \
@@ -3808,7 +3802,7 @@ torch==2.7.0+cpu \
38083802
--hash=sha256:f874c1ba4c834db5848eaafd6e63dfce87fb44bb2d9234978c3ad47b5b0f37dd
38093803
# via
38103804
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3811-
# -r python/requirements/serve/serve-requirements.txt
3805+
# -r python/requirements/serve/serve-test-requirements.txt
38123806
# torchvision
38133807
torchvision==0.22.0+cpu \
38143808
--hash=sha256:0172e52a8df7779632e5f7e7842e4de1e787e2a8f790b0bf4547ef1d025f16fd \
@@ -3825,7 +3819,7 @@ torchvision==0.22.0+cpu \
38253819
--hash=sha256:effb34eabe87ae0d811fe2d6e3433ed1eee2d1850ff0670964d1475a06512c73
38263820
# via
38273821
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3828-
# -r python/requirements/serve/serve-requirements.txt
3822+
# -r python/requirements/serve/serve-test-requirements.txt
38293823
tqdm==4.67.1 \
38303824
--hash=sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2 \
38313825
--hash=sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2
@@ -3838,7 +3832,7 @@ transformers==4.36.2 \
38383832
--hash=sha256:d8068e897e47793281501e547d2bbdfc5b8556409c2cb6c3d9e2ca77d4c0b4ec
38393833
# via
38403834
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3841-
# -r python/requirements/serve/serve-requirements.txt
3835+
# -r python/requirements/serve/serve-test-requirements.txt
38423836
typer==0.24.1 \
38433837
--hash=sha256:112c1f0ce578bfb4cab9ffdabc68f031416ebcc216536611ba21f04e9aa84c9e \
38443838
--hash=sha256:e39b4732d65fbdcde189ae76cf7cd48aeae72919dea1fdfc16593be016256b45
@@ -3849,7 +3843,7 @@ typing-extensions==4.15.0 \
38493843
--hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548
38503844
# via
38513845
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
3852-
# -r python/requirements/serve/serve-requirements.txt
3846+
# -r python/requirements/serve/serve-test-requirements.txt
38533847
# aiosignal
38543848
# anyio
38553849
# exceptiongroup
@@ -4087,7 +4081,7 @@ websockets==15.0.1 \
40874081
--hash=sha256:fcd5cf9e305d7b8338754470cf69cf81f420459dbae8a3b40cee57417f4614a7
40884082
# via
40894083
# -c /tmp/ray-deps/requirements_compiled_py3.13.txt
4090-
# -r python/requirements/serve/serve-requirements.txt
4084+
# -r python/requirements/serve/serve-test-requirements.txt
40914085
# gradio-client
40924086
# uvicorn
40934087
werkzeug==2.3.8 \

0 commit comments

Comments
 (0)