From cf914589b59b84ab7cf39a5f25f6c1fe09c8670d Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Thu, 19 Jun 2025 14:34:16 +0200 Subject: [PATCH 01/11] BLD fix missing license issue --- build_tools/wheels/test_wheels.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build_tools/wheels/test_wheels.sh b/build_tools/wheels/test_wheels.sh index 1d6ee19bda8a8..81e273d1c4035 100755 --- a/build_tools/wheels/test_wheels.sh +++ b/build_tools/wheels/test_wheels.sh @@ -5,6 +5,12 @@ set -x PROJECT_DIR="$1" +echo "############# ls -laR $PROJECT_DIR" +ls -laR $PROJECT_DIR + +echo "############# ls -laR $PROJECT_DIR/build_tools/wheels" +ls -laR $PROJECT_DIR/build_tools/wheels + python $PROJECT_DIR/build_tools/wheels/check_license.py python -c "import joblib; print(f'Number of cores (physical): \ From 90d077d68196018afe04454767a6f00157849d81 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Thu, 19 Jun 2025 14:35:12 +0200 Subject: [PATCH 02/11] [cd build] From 9d4b0b8daf4b5c27045986f19e31a98d75e1f511 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Thu, 19 Jun 2025 14:52:24 +0200 Subject: [PATCH 03/11] ... --- build_tools/wheels/check_license.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build_tools/wheels/check_license.py b/build_tools/wheels/check_license.py index 00fe4169be65d..ea35179abb101 100644 --- a/build_tools/wheels/check_license.py +++ b/build_tools/wheels/check_license.py @@ -2,6 +2,7 @@ import platform import site +import subprocess from itertools import chain from pathlib import Path @@ -20,6 +21,10 @@ except StopIteration as e: raise RuntimeError("Unable to find scikit-learn's dist-info") from e +# Print the output of ls -laR $distinfo_path for debugging purposes +print(f"Contents of {distinfo_path}:") +subprocess.run(["ls", "-laR", str(distinfo_path)], check=True) + license_text = (distinfo_path / "COPYING").read_text() assert "Copyright (c)" in license_text From 326b9971e68e63862f0754e9b3918bf1aeb1dbb0 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Thu, 19 Jun 2025 14:52:30 +0200 Subject: [PATCH 04/11] [cd build] From 5fed656b57a3aec004cbfcd70b30d0aff93007ff Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Thu, 19 Jun 2025 15:34:49 +0200 Subject: [PATCH 05/11] [cd build] From b33ecca3052be41c86056860bf7598b9762fb6b9 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Thu, 19 Jun 2025 15:34:59 +0200 Subject: [PATCH 06/11] [cd build] --- build_tools/wheels/check_license.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build_tools/wheels/check_license.py b/build_tools/wheels/check_license.py index ea35179abb101..56145a320f125 100644 --- a/build_tools/wheels/check_license.py +++ b/build_tools/wheels/check_license.py @@ -22,9 +22,10 @@ raise RuntimeError("Unable to find scikit-learn's dist-info") from e # Print the output of ls -laR $distinfo_path for debugging purposes -print(f"Contents of {distinfo_path}:") -subprocess.run(["ls", "-laR", str(distinfo_path)], check=True) +print(f"******************* Contents of {distinfo_path}:") +subprocess.run(["ls", "-laR", str(distinfo_path)]) +print("$$$$$$$$$$$$$$$$$$$$ $distinfo_path/COPYING") license_text = (distinfo_path / "COPYING").read_text() assert "Copyright (c)" in license_text From df8f445ad800d7ff8f418fc964eb7fa290a86bbf Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Mon, 23 Jun 2025 14:02:21 +0200 Subject: [PATCH 07/11] [cd build] --- build_tools/wheels/cibw_before_build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_tools/wheels/cibw_before_build.sh b/build_tools/wheels/cibw_before_build.sh index 4e4558db5a5bc..28b4277c4c51e 100755 --- a/build_tools/wheels/cibw_before_build.sh +++ b/build_tools/wheels/cibw_before_build.sh @@ -3,7 +3,7 @@ set -euxo pipefail PROJECT_DIR="$1" -LICENSE_FILE="$PROJECT_DIR/COPYING" +LICENSE_FILE="$PROJECT_DIR/license/COPYING" echo "" >>"$LICENSE_FILE" echo "----" >>"$LICENSE_FILE" @@ -16,3 +16,5 @@ elif [[ $RUNNER_OS == "macOS" ]]; then elif [[ $RUNNER_OS == "Windows" ]]; then cat $PROJECT_DIR/build_tools/wheels/LICENSE_windows.txt >>"$LICENSE_FILE" fi + +echo "^^^^^^ made the license" From f14ce579c720e9db78be2b282e3b53382ece4ae0 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Mon, 23 Jun 2025 14:05:58 +0200 Subject: [PATCH 08/11] [cd build] --- build_tools/wheels/cibw_before_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/wheels/cibw_before_build.sh b/build_tools/wheels/cibw_before_build.sh index 28b4277c4c51e..4fe575330ea33 100755 --- a/build_tools/wheels/cibw_before_build.sh +++ b/build_tools/wheels/cibw_before_build.sh @@ -3,7 +3,7 @@ set -euxo pipefail PROJECT_DIR="$1" -LICENSE_FILE="$PROJECT_DIR/license/COPYING" +LICENSE_FILE="$PROJECT_DIR/COPYING" echo "" >>"$LICENSE_FILE" echo "----" >>"$LICENSE_FILE" From bba2097dd4af870fef5f69fdea275dd22d93d850 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Mon, 23 Jun 2025 14:13:21 +0200 Subject: [PATCH 09/11] [cd build] --- build_tools/wheels/check_license.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/wheels/check_license.py b/build_tools/wheels/check_license.py index 56145a320f125..8fb9448cad123 100644 --- a/build_tools/wheels/check_license.py +++ b/build_tools/wheels/check_license.py @@ -26,7 +26,7 @@ subprocess.run(["ls", "-laR", str(distinfo_path)]) print("$$$$$$$$$$$$$$$$$$$$ $distinfo_path/COPYING") -license_text = (distinfo_path / "COPYING").read_text() +license_text = (distinfo_path / "licenses" / "COPYING").read_text() assert "Copyright (c)" in license_text From 063292091b75db8b1038a3e67b829e710feb5ba5 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Mon, 23 Jun 2025 14:23:09 +0200 Subject: [PATCH 10/11] [cd build] --- build_tools/wheels/check_license.py | 6 ------ build_tools/wheels/cibw_before_build.sh | 2 -- build_tools/wheels/test_wheels.sh | 6 ------ 3 files changed, 14 deletions(-) diff --git a/build_tools/wheels/check_license.py b/build_tools/wheels/check_license.py index 8fb9448cad123..bad33ae3cbc37 100644 --- a/build_tools/wheels/check_license.py +++ b/build_tools/wheels/check_license.py @@ -2,7 +2,6 @@ import platform import site -import subprocess from itertools import chain from pathlib import Path @@ -21,11 +20,6 @@ except StopIteration as e: raise RuntimeError("Unable to find scikit-learn's dist-info") from e -# Print the output of ls -laR $distinfo_path for debugging purposes -print(f"******************* Contents of {distinfo_path}:") -subprocess.run(["ls", "-laR", str(distinfo_path)]) - -print("$$$$$$$$$$$$$$$$$$$$ $distinfo_path/COPYING") license_text = (distinfo_path / "licenses" / "COPYING").read_text() assert "Copyright (c)" in license_text diff --git a/build_tools/wheels/cibw_before_build.sh b/build_tools/wheels/cibw_before_build.sh index 4fe575330ea33..4e4558db5a5bc 100755 --- a/build_tools/wheels/cibw_before_build.sh +++ b/build_tools/wheels/cibw_before_build.sh @@ -16,5 +16,3 @@ elif [[ $RUNNER_OS == "macOS" ]]; then elif [[ $RUNNER_OS == "Windows" ]]; then cat $PROJECT_DIR/build_tools/wheels/LICENSE_windows.txt >>"$LICENSE_FILE" fi - -echo "^^^^^^ made the license" diff --git a/build_tools/wheels/test_wheels.sh b/build_tools/wheels/test_wheels.sh index 81e273d1c4035..1d6ee19bda8a8 100755 --- a/build_tools/wheels/test_wheels.sh +++ b/build_tools/wheels/test_wheels.sh @@ -5,12 +5,6 @@ set -x PROJECT_DIR="$1" -echo "############# ls -laR $PROJECT_DIR" -ls -laR $PROJECT_DIR - -echo "############# ls -laR $PROJECT_DIR/build_tools/wheels" -ls -laR $PROJECT_DIR/build_tools/wheels - python $PROJECT_DIR/build_tools/wheels/check_license.py python -c "import joblib; print(f'Number of cores (physical): \ From 072bf426f0435a1d33937c9e914c49c086a93340 Mon Sep 17 00:00:00 2001 From: adrinjalali Date: Mon, 23 Jun 2025 15:46:03 +0200 Subject: [PATCH 11/11] [cd build]