Skip to content

Commit 39bf912

Browse files
authored
ARROW-125 Fix Linux Wheel File Names (#103)
* ARROW-125 Fix Linux Wheel File Names * fix order * fix exclusion * install auditwheel * fix test reqs * try an install in audit whee * try pinning auditwheel * try addtag directly * debug * try using AUDITWHEEL_PLAT * reinstate addtags.py * remove unused var * update changelog
1 parent 13b3d56 commit 39bf912

File tree

5 files changed

+15
-52
lines changed

5 files changed

+15
-52
lines changed

bindings/python/MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ include *.sh
44
include pyproject.toml
55

66
exclude THIRD-PARTY-NOTICES
7-
exclude release.sh
87
exclude addtags.py
98
exclude benchmark.py
109
exclude repair_wheel.py

bindings/python/addtags.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env python3
22
# Dependencies:
3-
# - auditwheel>=3,<4
3+
# - auditwheel>=5,<6
4+
# Requires AUDITWHEEL_PLAT to be set (e.g. manylinux2014_x86_64)
45
# Usage:
5-
# $ python addtags.py WHEEL_PATH TARGET_PLATFORM WHEEL_DIR
6+
# $ python addtags.py WHEEL_PATH WHEEL_DIR
67
import os
78
from os.path import abspath, basename, exists, isfile
89
from os.path import join as pjoin
@@ -45,5 +46,9 @@ def main(wheel_path, abi, wheel_dir):
4546

4647

4748
if __name__ == "__main__":
48-
WHEEL_PATH, TARGET_PLATFORM, WHEEL_DIR = argv[1], argv[2], argv[3]
49+
WHEEL_PATH, WHEEL_DIR = argv[1], argv[2]
50+
TARGET_PLATFORM = os.environ["AUDITWHEEL_PLAT"]
51+
print(f"wheel path: {WHEEL_PATH}")
52+
print(f"target platform: {TARGET_PLATFORM}")
53+
print(f"wheel dir: {WHEEL_DIR}")
4954
main(wheel_path=abspath(WHEEL_PATH), abi=TARGET_PLATFORM, wheel_dir=abspath(WHEEL_DIR))

bindings/python/docs/source/changelog.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
Changelog
22
=========
33

4-
Changes in Version 0.6.0
4+
Changes in Version 0.6.2
55
------------------------
6+
Note: We did not publish 0.6.0 or 0.6.1 due to technical difficulties.
7+
68
- Fixed ``ImportError`` on Windows by building ``libbson`` in "Release" mode.
79
- Support PyArrow 10.0.
810

bindings/python/pyproject.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ LIBBSON_INSTALL_DIR = "./libbson"
2020

2121
[tool.cibuildwheel.linux]
2222
manylinux-x86_64-image = "manylinux2014"
23+
repair-wheel-command = [
24+
"pip install \"auditwheel>=5,<6\"",
25+
"python addtags.py {wheel} {dest_dir}"
26+
]
2327

2428
[tool.cibuildwheel.macos]
2529
archs = "x86_64 universal2"

bindings/python/release.sh

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)