Skip to content

Commit c7e2a07

Browse files
authored
Merge pull request #50 from gkumbhat/move_vllm_optional
➖ Move vllm to optional dependency
2 parents f93f2b6 + e23cba1 commit c7e2a07

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

pyproject.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@ classifiers = [
1414

1515
dependencies = [
1616
"orjson>=3.10.16,<3.11",
17-
"vllm @ git+https://github.com/vllm-project/vllm.git@v0.7.3 ; sys_platform == 'darwin'",
18-
# NOTE: Currently vllm-tgis-adapter doesn't support vLLM 0.8.2, otherwise, vllm-detector-adapter
19-
# does work with higher version of vLLM
20-
"vllm>=0.7.3,<0.7.4 ; sys_platform != 'darwin'",
2117
]
2218

2319
[project.optional-dependencies]
2420
vllm-tgis-adapter = [
2521
"vllm-tgis-adapter>=0.6.3,<0.6.4"
2622
]
23+
vllm = [
24+
"vllm @ git+https://github.com/vllm-project/vllm.git@v0.7.3 ; sys_platform == 'darwin'",
25+
# NOTE: Currently vllm-tgis-adapter doesn't support vLLM 0.8.2, otherwise, vllm-detector-adapter
26+
# does work with higher version of vLLM
27+
"vllm>=0.7.3,<0.7.4 ; sys_platform != 'darwin'",
28+
]
2729

2830
## Dev Extra Sets ##
2931

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ description = run tests with pytest with coverage
66
extras =
77
all
88
dev-test
9+
vllm
910
passenv =
1011
LOG_LEVEL
1112
LOG_FILTERS
@@ -15,7 +16,7 @@ passenv =
1516
setenv =
1617
DFTYPE = pandas_all
1718

18-
commands = pytest --cov=vllm_detector_adapter --cov-report=html:coverage-{env_name} --cov-report=xml:coverage-{env_name}.xml --html=durations/{env_name}.html {posargs:tests} -W error::UserWarning
19+
commands = pytest --cov=vllm_detector_adapter --cov-report=html:coverage-{env_name} --cov-report=xml:coverage-{env_name}.xml --html=durations/{env_name}.html {posargs:tests} -W error::UserWarning
1920
; -W ignore::DeprecationWarning
2021

2122
; Unclear: We probably want to test wheel packaging

0 commit comments

Comments
 (0)