Skip to content

Update 3.4 branch to the latest changes in master #584

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.

Sign up for GitHub

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 8 commits into from
Nov 12, 2021
Merged

Update 3.4 branch to the latest changes in master #584

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
71bad8c
Fixed a build from the source
asenyaev Nov 1, 2021
4d0bc7d
Added 3.10 python version in the description
asenyaev Nov 1, 2021
b408641
Moving to auditwheel==5.0.0 (default in the latest manylinux image)
asenyaev Nov 7, 2021
31dde8a
Fix typos
kianmeng Nov 8, 2021
8599231
Changed defining path to scripts/__init__.py file
asenyaev Nov 8, 2021
c50150e
Defined 3.4.16 tag for opencv submodule
asenyaev Nov 11, 2021
19ed001
Added lines for a proper work using pylint and an autocomplete in IDE
asenyaev Nov 11, 2021
87e4f4d
Changed a string substitution to os.path.join
asenyaev Nov 11, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moving to auditwheel==5.0.0 (default in the latest manylinux image)
  • Loading branch information
@asenyaev
asenyaev committed Nov 11, 2021
commit b408641e253f2853f2d6310c2b3c5ad522b595a8
7 changes: 3 additions & 4 deletions patch_auditwheel_whitelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@

policies = None

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

for p in policies:
if p["name"] == "manylinux2014":
p["lib_whitelist"].append("libxcb.so.1")
p["lib_whitelist"].append("libxcb.so.1")

with open(join(dirname(abspath(policy.__file__)), "policy.json"), "w") as f:
with open(join(dirname(abspath(policy.__file__)), "manylinux-policy.json"), "w") as f:
f.write(json.dumps(policies))
8 changes: 4 additions & 4 deletions travis_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ function bdist_wheel_cmd {
CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
cp dist/*.whl $abs_wheelhouse
if [ -z "$IS_OSX" ]; then
TOOLS_PATH=/opt/_internal/tools
/opt/python/cp37-cp37m/bin/python -m venv $TOOLS_PATH
# this path can be changed in the latest manylinux image
TOOLS_PATH=/opt/_internal/pipx/venvs/auditwheel
/opt/python/cp39-cp39/bin/python -m venv $TOOLS_PATH
source $TOOLS_PATH/bin/activate
python$PYTHON_VERSION -m pip install auditwheel==3.2.0
python$PYTHON_VERSION patch_auditwheel_whitelist.py
python patch_auditwheel_whitelist.py
# to avoid issues with numpy wheels
rm /io/wheelhouse/numpy*
deactivate
Expand Down