From 494c990d0da0827e4486860c4ece887a2eb50d3c Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Mon, 21 Apr 2025 11:16:09 -0700 Subject: [PATCH 1/3] Remove our own manywheel fixup --- packaging/post_build_script.sh | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/packaging/post_build_script.sh b/packaging/post_build_script.sh index f77bc05f4..6f3760ab4 100755 --- a/packaging/post_build_script.sh +++ b/packaging/post_build_script.sh @@ -37,22 +37,5 @@ assert_not_in_wheel $wheel_path "^doc" assert_not_in_wheel $wheel_path "^benchmarks" assert_not_in_wheel $wheel_path "^packaging" -if [[ "$unamestr" == 'Linux' ]]; then - # TODO: Put this back with higher upper bound of version symbol. - # # See invoked python script below for details about this check. - # extracted_wheel_dir=$(mktemp -d) - # unzip -q $wheel_path -d $extracted_wheel_dir - # symbols_matches=$(find $extracted_wheel_dir | grep ".so$" | xargs objdump --syms | grep GLIBCXX_3.4.) - # python packaging/check_glibcxx.py "$symbols_matches" - - echo "ls dist" - ls dist - - old="linux_x86_64" - new="manylinux_2_17_x86_64.manylinux2014_x86_64" - echo "Replacing ${old} with ${new} in wheel name" - mv dist/*${old}*.whl $(echo dist/*${old}*.whl | sed "s/${old}/${new}/") -fi - echo "ls dist" ls dist From 11e97f66dcebb365bbfbaafe060fb5cb8db91b32 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Mon, 21 Apr 2025 11:23:24 -0700 Subject: [PATCH 2/3] Preserve commented out code --- packaging/post_build_script.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packaging/post_build_script.sh b/packaging/post_build_script.sh index 6f3760ab4..826761b36 100755 --- a/packaging/post_build_script.sh +++ b/packaging/post_build_script.sh @@ -37,5 +37,14 @@ assert_not_in_wheel $wheel_path "^doc" assert_not_in_wheel $wheel_path "^benchmarks" assert_not_in_wheel $wheel_path "^packaging" +if [[ "$unamestr" == 'Linux' ]]; then + # TODO: Put this back with higher upper bound of version symbol. + # # See invoked python script below for details about this check. + # extracted_wheel_dir=$(mktemp -d) + # unzip -q $wheel_path -d $extracted_wheel_dir + # symbols_matches=$(find $extracted_wheel_dir | grep ".so$" | xargs objdump --syms | grep GLIBCXX_3.4.) + # python packaging/check_glibcxx.py "$symbols_matches" +fi + echo "ls dist" ls dist From 8376576e59b3417fab7821ce830d70f1a33f8d99 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Mon, 21 Apr 2025 11:29:25 -0700 Subject: [PATCH 3/3] Comment out conditional --- packaging/post_build_script.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packaging/post_build_script.sh b/packaging/post_build_script.sh index 826761b36..ae2d162ef 100755 --- a/packaging/post_build_script.sh +++ b/packaging/post_build_script.sh @@ -37,14 +37,14 @@ assert_not_in_wheel $wheel_path "^doc" assert_not_in_wheel $wheel_path "^benchmarks" assert_not_in_wheel $wheel_path "^packaging" -if [[ "$unamestr" == 'Linux' ]]; then - # TODO: Put this back with higher upper bound of version symbol. - # # See invoked python script below for details about this check. - # extracted_wheel_dir=$(mktemp -d) - # unzip -q $wheel_path -d $extracted_wheel_dir - # symbols_matches=$(find $extracted_wheel_dir | grep ".so$" | xargs objdump --syms | grep GLIBCXX_3.4.) - # python packaging/check_glibcxx.py "$symbols_matches" -fi +# TODO: Put this back with higher upper bound of version symbol. +#if [[ "$unamestr" == 'Linux' ]]; then +# # See invoked python script below for details about this check. +# extracted_wheel_dir=$(mktemp -d) +# unzip -q $wheel_path -d $extracted_wheel_dir +# symbols_matches=$(find $extracted_wheel_dir | grep ".so$" | xargs objdump --syms | grep GLIBCXX_3.4.) +# python packaging/check_glibcxx.py "$symbols_matches" +#fi echo "ls dist" ls dist