Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that pip check does not fail due to bad platform tag (#10755)

Browse Source 
* Remove custom tag generation

* Revert "Remove custom tag generation"

This reverts commit fe3cf0e8786c7dc05e1deced3a1c92cd79094735.

* Fetch an accurate platform tag from Pip 22+

* Fix formatting

* TOML allows trailing commas

* Update patch

* Add trailing comma

* Fix up patch

* Use `packaging`

Co-authored-by: jakirkham <jakirkham@gmail.com>

---------

Co-authored-by: jakirkham <jakirkham@gmail.com>
This commit is contained in:
Philip Hyunsu Cho 2024-08-27 18:11:08 -07:00 committed by GitHub
parent 64afe9873b
commit 7794d3da8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python-package/hatch_build.py
View File

@ -3,16 +3,16 @@ Custom hook to customize the behavior of Hatchling.
Here, we customize the tag of the generated wheels. Here, we customize the tag of the generated wheels.
""" """
import sysconfig
from typing import Any, Dict from typing import Any, Dict
from hatchling.builders.hooks.plugin.interface import BuildHookInterface from hatchling.builders.hooks.plugin.interface import BuildHookInterface
from packaging.tags import platform_tags
def get_tag() -> str: def get_tag() -> str:
"""Get appropriate wheel tag according to system""" """Get appropriate wheel tag according to system"""
tag_platform = sysconfig.get_platform().replace("-", "_").replace(".", "_") platform_tag = next(platform_tags())
return f"py3-none-{tag_platform}" return f"py3-none-{platform_tag}"
class CustomBuildHook(BuildHookInterface): class CustomBuildHook(BuildHookInterface):

5
python-package/pyproject.toml
View File

@ -1,6 +1,7 @@
[build-system] [build-system]
requires = [ requires = [
"hatchling>=1.12.1" "hatchling>=1.12.1",
"packaging>=21.3",
] ]
backend-path = ["."] backend-path = ["."]
build-backend = "packager.pep517" build-backend = "packager.pep517"
@ -29,7 +30,7 @@ classifiers = [
dependencies = [ dependencies = [
"numpy", "numpy",
"scipy", "scipy",
"nvidia-nccl-cu12 ; platform_system == 'Linux' and platform_machine != 'aarch64'" "nvidia-nccl-cu12 ; platform_system == 'Linux' and platform_machine != 'aarch64'",
] ]
[project.urls] [project.urls]

10
tests/buildkite/remove_nccl_dep.patch
View File

@ -1,14 +1,12 @@
diff --git python-package/pyproject.toml python-package/pyproject.toml diff --git python-package/pyproject.toml python-package/pyproject.toml
index 8835def25..46c1451c2 100644 index 20d3f9974..953087ff4 100644
--- python-package/pyproject.toml --- python-package/pyproject.toml
+++ python-package/pyproject.toml +++ python-package/pyproject.toml
@@ -30,8 +30,7 @@ classifiers = [ @@ -30,7 +30,6 @@ classifiers = [
]
dependencies = [ dependencies = [
"numpy", "numpy",
- "scipy", "scipy",
- "nvidia-nccl-cu12 ; platform_system == 'Linux' and platform_machine != 'aarch64'" - "nvidia-nccl-cu12 ; platform_system == 'Linux' and platform_machine != 'aarch64'",
+ "scipy"
] ]
[project.urls] [project.urls]