Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 69a9a93

Browse filesBrowse files
authored
Merge pull request opencv#581 from asenyaev/asen/upgrade_auditwheel
Moving to auditwheel 5.0.0
2 parents 7052ed7 + f46eabb commit 69a9a93
Copy full SHA for 69a9a93

File tree

2 files changed

+7
-8
lines changed
Filter options

2 files changed

+7
-8
lines changed

‎patch_auditwheel_whitelist.py

Copy file name to clipboardExpand all lines: patch_auditwheel_whitelist.py
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55

66
policies = None
77

8-
with open(join(dirname(abspath(policy.__file__)), "policy.json")) as f:
8+
with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json")) as f:
99
policies = json.load(f)
1010

1111
for p in policies:
12-
if p["name"] == "manylinux2014":
13-
p["lib_whitelist"].append("libxcb.so.1")
12+
p["lib_whitelist"].append("libxcb.so.1")
1413

15-
with open(join(dirname(abspath(policy.__file__)), "policy.json"), "w") as f:
14+
with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), "w") as f:
1615
f.write(json.dumps(policies))

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ function bdist_wheel_cmd {
1717
CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
1818
cp dist/*.whl $abs_wheelhouse
1919
if [ -z "$IS_OSX" ]; then
20-
TOOLS_PATH=/opt/_internal/tools
21-
/opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
20+
# this path can be changed in the latest manylinux image
21+
TOOLS_PATH=/opt/_internal/pipx/venvs/auditwheel
22+
/opt/python/cp39-cp39/bin/python -m venv $TOOLS_PATH
2223
source $TOOLS_PATH/bin/activate
23-
python$PYTHON_VERSION -m pip install auditwheel==3.2.0
24-
python$PYTHON_VERSION patch_auditwheel_whitelist.py
24+
python patch_auditwheel_whitelist.py
2525
# to avoid issues with numpy wheels
2626
rm /io/wheelhouse/numpy*
2727
deactivate

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.