From a9e01d958fe82fb8bd0e5043796c64ae49edcd61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?= Date: Wed, 2 Dec 2020 14:56:41 +0100 Subject: [PATCH 1/5] CI Dynamically select unpack directory --- .github/workflows/wheels.yml | 6 +----- build_tools/github/repair_windows_wheels.sh | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f0f824d32b9c9..1e701a58fa5f2 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -17,9 +17,6 @@ on: # Manual run workflow_dispatch: -env: - SCIKIT_LEARN_VERSION: 0.24.dev0 - jobs: # Check whether to build the wheels and the source tarball check_build_trigger: @@ -82,8 +79,7 @@ jobs: env: CONFTEST_PATH: ${{ github.workspace }}/conftest.py CONFTEST_NAME: conftest.py - CIBW_ENVIRONMENT: WHEEL_DIRNAME=scikit_learn-$SCIKIT_LEARN_VERSION - OMP_NUM_THREADS=2 + CIBW_ENVIRONMENT: OMP_NUM_THREADS=2 OPENBLAS_NUM_THREADS=2 SKLEARN_SKIP_NETWORK_TESTS=1 SKLEARN_BUILD_PARALLEL=3 diff --git a/build_tools/github/repair_windows_wheels.sh b/build_tools/github/repair_windows_wheels.sh index eb937e83b7aa4..b5497f0da189a 100644 --- a/build_tools/github/repair_windows_wheels.sh +++ b/build_tools/github/repair_windows_wheels.sh @@ -9,7 +9,8 @@ BITNESS=$3 # By default, the Windows wheels are not repaired. # In this case, we need to vendor VCRUNTIME140.dll -wheel unpack "$WHEEL" +wheel unpack -d "$WHEEL" +WHEEL_DIRNAME=$(ls -d scikit-learn-*) python build_tools/github/vendor.py "$WHEEL_DIRNAME" "$BITNESS" wheel pack "$WHEEL_DIRNAME" -d "$DEST_DIR" rm -rf "$WHEEL_DIRNAME" From 7ce1c87038802a29c9d3f0768b4c4c50a53d32c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?= Date: Wed, 2 Dec 2020 14:59:08 +0100 Subject: [PATCH 2/5] Trigger build From 5a6a66878da4ae07cc1fed5cdfdf1e7cdab93766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?= Date: Wed, 2 Dec 2020 14:59:49 +0100 Subject: [PATCH 3/5] Trigger build [cd build] From dc199b95bb4459bedad20b3c6b8060f0e91f5ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?= Date: Wed, 2 Dec 2020 15:02:22 +0100 Subject: [PATCH 4/5] Trigger build [cd build] --- build_tools/github/repair_windows_wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/github/repair_windows_wheels.sh b/build_tools/github/repair_windows_wheels.sh index b5497f0da189a..8d29f7d94708f 100644 --- a/build_tools/github/repair_windows_wheels.sh +++ b/build_tools/github/repair_windows_wheels.sh @@ -9,7 +9,7 @@ BITNESS=$3 # By default, the Windows wheels are not repaired. # In this case, we need to vendor VCRUNTIME140.dll -wheel unpack -d "$WHEEL" +wheel unpack "$WHEEL" WHEEL_DIRNAME=$(ls -d scikit-learn-*) python build_tools/github/vendor.py "$WHEEL_DIRNAME" "$BITNESS" wheel pack "$WHEEL_DIRNAME" -d "$DEST_DIR" From 4332348a101e75bb9e0d5d0c34c9240b9fa90090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Alfaro=20Jim=C3=A9nez?= Date: Wed, 2 Dec 2020 15:09:06 +0100 Subject: [PATCH 5/5] MNT Change destination directory [cd build] --- build_tools/github/repair_windows_wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/github/repair_windows_wheels.sh b/build_tools/github/repair_windows_wheels.sh index 8d29f7d94708f..de564fc177c89 100644 --- a/build_tools/github/repair_windows_wheels.sh +++ b/build_tools/github/repair_windows_wheels.sh @@ -10,7 +10,7 @@ BITNESS=$3 # By default, the Windows wheels are not repaired. # In this case, we need to vendor VCRUNTIME140.dll wheel unpack "$WHEEL" -WHEEL_DIRNAME=$(ls -d scikit-learn-*) +WHEEL_DIRNAME=$(ls -d scikit_learn-*) python build_tools/github/vendor.py "$WHEEL_DIRNAME" "$BITNESS" wheel pack "$WHEEL_DIRNAME" -d "$DEST_DIR" rm -rf "$WHEEL_DIRNAME"