fix python 3.10 references in wheel names

mozilla · Jan 10, 2025 · e4f9d1b · e4f9d1b
1 parent 3033223
commit e4f9d1b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/