chore: build pyodide wheel

benjamin-awd · Jun 7, 2024 · d3d5966 · d3d5966
1 parent 8356fbd
commit d3d5966
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/build_pyodide.yml b/.github/workflows/build_pyodide.yml
@@ -57,8 +57,10 @@ jobs:
             inputs_wheels_default: 0
             inputs_wheels_linux_pyodide: 1
             inputs_wheels_implementations: b
-        run:
-          sudo apt-get install python3-distutils && python scripts/gh_release.py build
+        run: |
+          python -m pip install --upgrade setuptools
+          python -m pip install --upgrade virtualenv
+          python scripts/gh_release.py build
 
 
       # Upload generated wheels, to be accessible from github Actions page.

diff --git a/gh_release.py b/gh_release.py
@@ -571,12 +571,16 @@ def pyodide_setup(clean=False):
     #
     venv_pyodide = 'venv_pyodide'
     if not os.path.exists( venv_pyodide):
+        command += f' && echo "### upgrading virtualenv" ...'
+        command += f' && python -m pip install --upgrade virtualenv'
         command += f' && echo "### creating venv {venv_pyodide}"'
-        command += f' && {sys.executable} -m venv {venv_pyodide}'
+        command += f' && {sys.executable} -m venv  --upgrade-embed-wheels {venv_pyodide}'
     command += f' && . {venv_pyodide}/bin/activate'
-    command += f' && echo "### running pip install ..."'
+    command += f' && echo "### upgrading pip ..."'
+    command += f' && python -m ensurepip --upgrade'
     command += f' && echo "### installing setuptools ..."'
-    command += f' && python -m pip install --upgrade pip wheel setuptools==70.0.0'
+    command += f' && python -m pip install --upgrade setuptools'
+    command += f' && echo "### running pip install ..."'
     command += f' && python -m pip install --upgrade pip wheel pyodide-build==0.23.4'
 
     # Run emsdk install scripts and enter emsdk environment.