From e4f9d1b3ae56fa942d5456fbf60379e58d78e848 Mon Sep 17 00:00:00 2001 From: Ben Hearsum Date: Fri, 10 Jan 2025 12:25:20 -0500 Subject: [PATCH] fix python 3.10 references in wheel names --- taskcluster/kinds/bicleaner-model/kind.yml | 4 ++-- taskcluster/kinds/bicleaner/kind.yml | 4 ++-- taskcluster/kinds/toolchain/kind.yml | 4 ++-- taskcluster/scripts/toolchain/build-kenlm.sh | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/taskcluster/kinds/bicleaner-model/kind.yml b/taskcluster/kinds/bicleaner-model/kind.yml index b78ff4680..7b4494899 100644 --- a/taskcluster/kinds/bicleaner-model/kind.yml +++ b/taskcluster/kinds/bicleaner-model/kind.yml @@ -59,8 +59,8 @@ tasks: - bash - -c - >- - pip install --break-system-packages $MOZ_FETCHES_DIR/cyhunspell-2.0.3-cp310-cp310-linux_x86_64.whl && - pip install --break-system-packages $MOZ_FETCHES_DIR/kenlm-0.0.0-cp310-cp310-linux_x86_64.whl && + pip install --break-system-packages $MOZ_FETCHES_DIR/cyhunspell-2.0.3-cp312-cp312-linux_x86_64.whl && + pip install --break-system-packages $MOZ_FETCHES_DIR/kenlm-0.0.0-cp312-cp312-linux_x86_64.whl && pip install --break-system-packages -r $VCS_PATH/pipeline/bicleaner/requirements/bicleaner-ai.txt && export PATH=$PATH:~/.local/bin && export PYTHONPATH=$PYTHONPATH:$VCS_PATH && diff --git a/taskcluster/kinds/bicleaner/kind.yml b/taskcluster/kinds/bicleaner/kind.yml index 443a774ce..02b86a01e 100644 --- a/taskcluster/kinds/bicleaner/kind.yml +++ b/taskcluster/kinds/bicleaner/kind.yml @@ -100,8 +100,8 @@ tasks: # 4) number of threads to use - auto means nproc # 5) "pack dir" - which needs to be where the `bicleaner-src-trg` fetch was unpacked to - >- - pip install --break-system-packages $MOZ_FETCHES_DIR/cyhunspell-2.0.3-cp310-cp310-linux_x86_64.whl && - pip install --break-system-packages $MOZ_FETCHES_DIR/kenlm-0.0.0-cp310-cp310-linux_x86_64.whl && + pip install --break-system-packages $MOZ_FETCHES_DIR/cyhunspell-2.0.3-cp312-cp312-linux_x86_64.whl && + pip install --break-system-packages $MOZ_FETCHES_DIR/kenlm-0.0.0-cp312-cp312-linux_x86_64.whl && pip install --break-system-packages -r {bicleaner_reqs} && export PATH=$PATH:~/.local/bin && $VCS_PATH/pipeline/bicleaner/bicleaner.sh diff --git a/taskcluster/kinds/toolchain/kind.yml b/taskcluster/kinds/toolchain/kind.yml index 0cad50bc4..124e9e0fb 100644 --- a/taskcluster/kinds/toolchain/kind.yml +++ b/taskcluster/kinds/toolchain/kind.yml @@ -134,7 +134,7 @@ tasks: script: build-kenlm.sh resources: - taskcluster/scripts/toolchain/build-kenlm.sh - toolchain-artifact: public/build/kenlm-0.0.0-cp310-cp310-linux_x86_64.whl + toolchain-artifact: public/build/kenlm-0.0.0-cp312-cp312-linux_x86_64.whl fetches: fetch: - kenlm @@ -145,7 +145,7 @@ tasks: script: build-hunspell.sh resources: - taskcluster/scripts/toolchain/build-hunspell.sh - toolchain-artifact: public/build/cyhunspell-2.0.3-cp310-cp310-linux_x86_64.whl + toolchain-artifact: public/build/cyhunspell-2.0.3-cp312-cp312-linux_x86_64.whl fetches: fetch: - cyhunspell diff --git a/taskcluster/scripts/toolchain/build-kenlm.sh b/taskcluster/scripts/toolchain/build-kenlm.sh index 156d60bcc..169a0f98e 100755 --- a/taskcluster/scripts/toolchain/build-kenlm.sh +++ b/taskcluster/scripts/toolchain/build-kenlm.sh @@ -16,4 +16,5 @@ cd $KENLM_DIR pip install --break-system-packages setuptools wheel cmake MAX_ORDER=7 python3 setup.py bdist_wheel find . -cp $KENLM_DIR/dist/kenlm-0.0.0-cp310-cp310-linux_x86_64.whl $UPLOAD_DIR/ +whl=$($KENLM_DIR/dist/*.whl) +cp $whl $UPLOAD_DIR/