From 3ab02b2da52ace506b1122df6959dd2fa0cf5848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 2 Jun 2024 07:09:09 +0200 Subject: [PATCH 1/7] MAINT Use Pyodide venv rather than js wrapper script --- build_tools/azure/install_pyodide.sh | 5 ++++- build_tools/azure/test_script_pyodide.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 build_tools/azure/install_pyodide.sh mode change 100644 => 100755 build_tools/azure/test_script_pyodide.sh diff --git a/build_tools/azure/install_pyodide.sh b/build_tools/azure/install_pyodide.sh old mode 100644 new mode 100755 index 58d0348a53202..bdbdef7e0bd7c --- a/build_tools/azure/install_pyodide.sh +++ b/build_tools/azure/install_pyodide.sh @@ -17,4 +17,7 @@ ls -ltrh dist # The Pyodide js library is needed by build_tools/azure/test_script_pyodide.sh # to run tests inside Pyodide -npm install pyodide@$PYODIDE_VERSION +# npm install pyodide@$PYODIDE_VERSION +pyodide venv .pyodide-venv +source .pyodide-venv/bin/activate +pip install dist/*.whl diff --git a/build_tools/azure/test_script_pyodide.sh b/build_tools/azure/test_script_pyodide.sh old mode 100644 new mode 100755 index d1aa207f864a2..e7dd2d4da202b --- a/build_tools/azure/test_script_pyodide.sh +++ b/build_tools/azure/test_script_pyodide.sh @@ -6,4 +6,5 @@ set -e # one day we can use a Pyodide venv instead but at the time of writing # (2023-09-27) there is an issue with scipy.linalg in a Pyodide venv, see # https://github.com/pyodide/pyodide/issues/3865 for more details. -node build_tools/azure/pytest-pyodide.js --pyargs sklearn --durations 20 --showlocals +# node build_tools/azure/pytest-pyodide.js --pyargs sklearn --durations 20 --showlocals +pytest --pyargs sklearn --durations 20 --showlocals From 606a8535f9c8ad83692ae15af9fcd39c16ef625c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 2 Jun 2024 07:10:31 +0200 Subject: [PATCH 2/7] [pyodide] Trigger CI From 6b9c4b02c28b2de7d1001a07a187ab56977e5438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 2 Jun 2024 07:20:34 +0200 Subject: [PATCH 3/7] [pyodide] fix --- build_tools/azure/test_script_pyodide.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_tools/azure/test_script_pyodide.sh b/build_tools/azure/test_script_pyodide.sh index e7dd2d4da202b..2c6b1192d63fa 100755 --- a/build_tools/azure/test_script_pyodide.sh +++ b/build_tools/azure/test_script_pyodide.sh @@ -7,4 +7,5 @@ set -e # (2023-09-27) there is an issue with scipy.linalg in a Pyodide venv, see # https://github.com/pyodide/pyodide/issues/3865 for more details. # node build_tools/azure/pytest-pyodide.js --pyargs sklearn --durations 20 --showlocals +pip install pytest pytest --pyargs sklearn --durations 20 --showlocals From 00783ac29df13348e62d4e42702164570dde219c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 2 Jun 2024 07:31:42 +0200 Subject: [PATCH 4/7] [pyodide] fix --- build_tools/azure/test_script_pyodide.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_tools/azure/test_script_pyodide.sh b/build_tools/azure/test_script_pyodide.sh index 2c6b1192d63fa..b6cbc69acc45c 100755 --- a/build_tools/azure/test_script_pyodide.sh +++ b/build_tools/azure/test_script_pyodide.sh @@ -7,5 +7,6 @@ set -e # (2023-09-27) there is an issue with scipy.linalg in a Pyodide venv, see # https://github.com/pyodide/pyodide/issues/3865 for more details. # node build_tools/azure/pytest-pyodide.js --pyargs sklearn --durations 20 --showlocals +source .pyodide-venv/bin/activate pip install pytest pytest --pyargs sklearn --durations 20 --showlocals From cd816d8a081c5ab3b9403005a46fa5b1f090adfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 2 Jun 2024 07:48:30 +0200 Subject: [PATCH 5/7] [pyodide] fix --- build_tools/azure/test_script_pyodide.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build_tools/azure/test_script_pyodide.sh b/build_tools/azure/test_script_pyodide.sh index b6cbc69acc45c..fc7f9779c65ef 100755 --- a/build_tools/azure/test_script_pyodide.sh +++ b/build_tools/azure/test_script_pyodide.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -ex # We are using a pytest js wrapper script to run tests inside Pyodide. Maybe # one day we can use a Pyodide venv instead but at the time of writing @@ -8,5 +8,9 @@ set -e # https://github.com/pyodide/pyodide/issues/3865 for more details. # node build_tools/azure/pytest-pyodide.js --pyargs sklearn --durations 20 --showlocals source .pyodide-venv/bin/activate +which pip pip install pytest +cd /tmp +which pytest +python -c 'import sklearn; print(sklearn.__file__)' pytest --pyargs sklearn --durations 20 --showlocals From aeec9c4d53b9a43ba989a8dbb1d3c932220703d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 2 Jun 2024 07:48:43 +0200 Subject: [PATCH 6/7] [pyodide] fix --- build_tools/azure/test_script_pyodide.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build_tools/azure/test_script_pyodide.sh b/build_tools/azure/test_script_pyodide.sh index fc7f9779c65ef..8b90d1b8ca6ac 100755 --- a/build_tools/azure/test_script_pyodide.sh +++ b/build_tools/azure/test_script_pyodide.sh @@ -10,6 +10,7 @@ set -ex source .pyodide-venv/bin/activate which pip pip install pytest +df -h cd /tmp which pytest python -c 'import sklearn; print(sklearn.__file__)' From 07392c78d38b5a71a3f4d15bc65e0d9d6a6d3417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Est=C3=A8ve?= Date: Sun, 2 Jun 2024 08:11:15 +0200 Subject: [PATCH 7/7] [pyodide] Try Pyodide 0.26 --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9b0e8c2259f19..3599c82e3c9bc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -124,11 +124,11 @@ jobs: vmImage: ubuntu-22.04 variables: # Need to match Python version and Emscripten version for the correct - # Pyodide version. For example, for Pyodide version 0.25.1, see - # https://github.com/pyodide/pyodide/blob/0.25.1/Makefile.envs - PYODIDE_VERSION: '0.25.1' - EMSCRIPTEN_VERSION: '3.1.46' - PYTHON_VERSION: '3.11.3' + # Pyodide version. For example, for Pyodide version 0.26.0, see + # https://github.com/pyodide/pyodide/blob/0.26.0/Makefile.envs + PYODIDE_VERSION: '0.26.0' + EMSCRIPTEN_VERSION: '3.1.58' + PYTHON_VERSION: '3.12.1' dependsOn: [git_commit, linting] condition: |