Skip to content

Commit 3a447fa

Browse files
committed
tweak setup.py patches and dependencies
1 parent 15252cd commit 3a447fa

File tree

3 files changed

+25
-33
lines changed

3 files changed

+25
-33
lines changed

recipe/meta.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ outputs:
172172
- colorful
173173
- grpcio
174174
- opencensus
175-
- opentelemetry-sdk
175+
- opentelemetry-sdk >=1.30.0
176176
- opentelemetry-exporter-prometheus
177177
- opentelemetry-proto
178178
- prometheus_client >=0.7.1
@@ -233,7 +233,6 @@ outputs:
233233
run:
234234
- python
235235
- {{ pin_subpackage('ray-default', exact=True) }}
236-
- aiorwlock
237236
- fastapi
238237
- requests
239238
- starlette
@@ -256,7 +255,7 @@ outputs:
256255
- {{ pin_subpackage('ray-default', exact=True) }}
257256
- fsspec
258257
- pandas
259-
- pyarrow >=6.0.1
258+
- pyarrow
260259
- requests
261260
- tensorboardX >=1.9
262261
test:
@@ -282,9 +281,6 @@ outputs:
282281
run:
283282
- python
284283
- {{ pin_subpackage('ray-default', exact=True) }}
285-
- opentelemetry-api
286-
- opentelemetry-sdk
287-
- opentelemetry-exporter-otlp
288284
- memray # [not win]
289285
test:
290286
commands:

recipe/patches/0001-Disable-making-entry-scripts.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ diff --git a/python/setup.py b/python/setup.py
1111
index 838f3aa744..c287eb4cc1 100644
1212
--- a/python/setup.py
1313
+++ b/python/setup.py
14-
@@ -832,9 +832,9 @@ setuptools.setup(
14+
@@ -767,9 +767,9 @@ setuptools.setup(
1515
extras_require=setup_spec.extras,
1616
entry_points={
1717
"console_scripts": [

recipe/patches/0003-remove-dependencies.patch

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
From 2595ec41a9d00d40b8b56442087f109307f403ec Mon Sep 17 00:00:00 2001
2-
From: mattip <matti.picus@gmail.com>
3-
Date: Fri, 28 Feb 2025 15:22:50 +0200
4-
Subject: [PATCH 3/9] remove dependencies
1+
From 7bacb8f1cf2da34aa7fd0d92f834d19bd924daf8 Mon Sep 17 00:00:00 2001
2+
From: Matti Picus <matti.picus@gmail.com>
3+
Date: Sun, 20 Jul 2025 07:49:55 +1000
4+
Subject: [PATCH] remove dependencies
55

66
---
7-
python/setup.py | 159 +++++-------------------------------------------
8-
1 file changed, 14 insertions(+), 145 deletions(-)
7+
python/setup.py | 158 +++++-------------------------------------------
8+
1 file changed, 14 insertions(+), 144 deletions(-)
99

1010
diff --git a/python/setup.py b/python/setup.py
11-
index c287eb4cc1..25b08d3540 100644
11+
index 9c964783d8..862ba789a0 100644
1212
--- a/python/setup.py
1313
+++ b/python/setup.py
14-
@@ -225,135 +225,23 @@ ray_files += [
14+
@@ -216,131 +216,23 @@ ray_files += [
1515
# also update the matching section of requirements/requirements.txt
1616
# in this directory
1717
if setup_spec.type == SetupType.RAY:
1818
- pandas_dep = "pandas >= 1.3"
1919
- numpy_dep = "numpy >= 1.20"
2020
- pyarrow_deps = [
2121
- "pyarrow >= 9.0.0",
22-
- "pyarrow <18; sys_platform == 'darwin' and platform_machine == 'x86_64'",
2322
- ]
2423
- pydantic_dep = "pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3"
2524
setup_spec.extras = {
@@ -50,7 +49,7 @@ index c287eb4cc1..25b08d3540 100644
5049
- "grpcio >= 1.32.0; python_version < '3.10'", # noqa:E501
5150
- "grpcio >= 1.42.0; python_version >= '3.10'", # noqa:E501
5251
- "opencensus",
53-
- "opentelemetry-sdk",
52+
- "opentelemetry-sdk >= 1.30.0",
5453
- "opentelemetry-exporter-prometheus",
5554
- "opentelemetry-proto",
5655
- pydantic_dep,
@@ -59,9 +58,6 @@ index c287eb4cc1..25b08d3540 100644
5958
- "virtualenv >=20.0.24, !=20.21.1", # For pip runtime env.
6059
- ],
6160
- "observability": [
62-
- "opentelemetry-api",
63-
- "opentelemetry-sdk",
64-
- "opentelemetry-exporter-otlp",
6561
- "memray; sys_platform != 'win32'",
6662
- ],
6763
- "serve": [
@@ -159,13 +155,13 @@ index c287eb4cc1..25b08d3540 100644
159155

160156
# "llm" is not included in all, by design. vllm's dependency set is very
161157
# large and specific, will likely run into dependency conflicts with other
162-
@@ -362,19 +253,6 @@ if setup_spec.type == SetupType.RAY:
158+
@@ -352,19 +244,6 @@ if setup_spec.type == SetupType.RAY:
163159
# Keep this in sync with python/requirements/llm/llm-requirements.txt
164160
#
165161
setup_spec.extras["llm"] = list(
166162
- set(
167163
- [
168-
- "vllm>=0.8.5",
164+
- "vllm>=0.9.2",
169165
- "jsonref>=1.1.0",
170166
- "jsonschema",
171167
- "ninja",
@@ -179,7 +175,7 @@ index c287eb4cc1..25b08d3540 100644
179175
)
180176

181177
# These are the main dependencies for users of ray. This list
182-
@@ -385,16 +263,7 @@ if setup_spec.type == SetupType.RAY:
178+
@@ -375,16 +254,7 @@ if setup_spec.type == SetupType.RAY:
183179
# install-core-prerelease-dependencies.sh so we can test
184180
# new releases candidates.
185181
if setup_spec.type == SetupType.RAY:
@@ -197,15 +193,15 @@ index c287eb4cc1..25b08d3540 100644
197193

198194

199195
def is_native_windows_or_msys():
200-
@@ -828,7 +697,7 @@ setuptools.setup(
201-
# The BinaryDistribution argument triggers build_ext.
202-
distclass=BinaryDistribution,
203-
install_requires=setup_spec.install_requires,
204-
- setup_requires=["cython >= 3.0.12", "pip", "wheel"],
205-
+ setup_requires=[],
206-
extras_require=setup_spec.extras,
207-
entry_points={
208-
"console_scripts": [
196+
@@ -763,7 +633,7 @@ if __name__ == "__main__":
197+
# The BinaryDistribution argument triggers build_ext.
198+
distclass=BinaryDistribution,
199+
install_requires=setup_spec.install_requires,
200+
- setup_requires=["cython >= 3.0.12", "pip", "wheel"],
201+
+ setup_requires=[],
202+
extras_require=setup_spec.extras,
203+
entry_points={
204+
"console_scripts": [
209205
--
210-
2.43.0
206+
2.39.5 (Apple Git-154)
211207

0 commit comments

Comments
 (0)