Skip to content

[Misc] fix collect_env version parse #15267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2025

Conversation

wangxiyuan
Copy link
Contributor

@wangxiyuan wangxiyuan commented Mar 21, 2025

The version parse in collect_env.py is not correct. The __version_tuple__ from setuptools_scm is a tuple like
(0,8,1), (0,8,1,dev86,ge588ac237) or (0,8,1,dev86,ge588ac237+d20250321). The length will never be 4. See: https://setuptools-scm.readthedocs.io/en/stable/usage/ which the length is not limited to 4.

We should pares the __version_tuple__ in a correct way. With this PR, the version will be parsed into some result:

  1. if setuptools_scm is not working, the result will be N/A (dev)
  2. if vllm is a tagged version, the result will be 0.8.1
  3. if vllm is a dev version, the result will be 0.8.2.dev86+ge588ac237 (git_sha: e588ac237)
  4. if vllm is a dev version with local changes, the result will be 0.8.2.dev86+ge588ac237.d20250321 (git sha: e588ac237, date: 20250321)

Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

Copy link
Collaborator

@houseroad houseroad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add some unittest?

@youkaichao
Copy link
Member

Can we add some unittest?

unittest would be ideal, but it's complicated to test all the cases, e.g. released versions, dev versions, local installed versions, etc.

@wangxiyuan
Copy link
Contributor Author

Fixed merge conflict

@youkaichao youkaichao merged commit d9ac9e3 into vllm-project:main Apr 21, 2025
21 checks passed
yangw-dev pushed a commit to yangw-dev/vllm that referenced this pull request Apr 21, 2025
dtransposed pushed a commit to dtransposed/vllm that referenced this pull request Apr 22, 2025
Signed-off-by: wangxiyuan <[email protected]>
Signed-off-by: dtransposed <damian@damian-ml-machine.europe-west3-b.c.jetbrains-grazie.internal>
frieda-huang pushed a commit to frieda-huang/vllm that referenced this pull request Apr 23, 2025
Signed-off-by: wangxiyuan <[email protected]>
Signed-off-by: Frieda (Jingying) Huang <[email protected]>
liuzijing2014 pushed a commit to liuzijing2014/vllm that referenced this pull request Apr 25, 2025
liuzijing2014 pushed a commit to liuzijing2014/vllm that referenced this pull request Apr 25, 2025
wuisawesome pushed a commit to character-tech/vllm that referenced this pull request Apr 28, 2025
jikunshang pushed a commit to jikunshang/vllm that referenced this pull request Apr 29, 2025
lk-chen pushed a commit to lk-chen/vllm that referenced this pull request Apr 29, 2025
adobrzyn pushed a commit to HabanaAI/vllm-fork that referenced this pull request Apr 30, 2025
Signed-off-by: wangxiyuan <[email protected]>
Signed-off-by: Agata Dobrzyniewicz <[email protected]>
RichardoMrMu pushed a commit to RichardoMrMu/vllm that referenced this pull request May 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants