Merge pull request #1679 from finos/wheelfix

fix wheel build, make extension first to ensure binaries are inlined, then assemble wheel
finos · Dec 23, 2021 · 0e02b37 · 0e02b37
2 parents e5b8866 + f84fa64
commit 0e02b37
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -46,6 +46,9 @@ parameters:
       - bash: yarn --frozen-lockfile
         displayName: "Install Javascript Dependencies"
 
+  - name: pythonInitSteps
+    type: stepList
+    default:
       - task: UsePythonVersion@0
         inputs:
           versionSpec: "$(python.version)"
@@ -56,6 +59,12 @@ parameters:
         displayName: "Install Python base dependencies"
         condition: succeeded()
 
+  - name: wasmInitSteps
+    type: stepList
+    default:
+      - bash: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+        displayName: "Install wasm-pack"
+
   - name: linuxInitSteps
     type: stepList
     default:
@@ -233,6 +242,7 @@ jobs:
 
     steps:
       - ${{ parameters.initSteps }}
+      - ${{ parameters.wasmInitSteps }}
       - ${{ parameters.linuxInitSteps }}
       - ${{ parameters.webassemblySteps }}
 
@@ -363,6 +373,7 @@ jobs:
 
     steps:
       - ${{ parameters.initSteps }}
+      - ${{ parameters.pythonInitSteps }}
       - ${{ parameters.pythonBuildDockerSteps }}
       - ${{ parameters.pythonCoverageSteps }}
       - ${{ parameters.pythonLinuxWheelSteps }}
@@ -405,6 +416,7 @@ jobs:
 
     steps:
       - ${{ parameters.initSteps }}
+      - ${{ parameters.pythonInitSteps }}
       - ${{ parameters.windowsInitSteps }}
       - ${{ parameters.pythonBuildVS2019Steps }}
 
@@ -432,6 +444,7 @@ jobs:
 
     steps:
       - ${{ parameters.initSteps }}
+      - ${{ parameters.pythonInitSteps }}
       - ${{ parameters.windowsInitSteps }}
       - ${{ parameters.pythonWindowsWheelVS2019Steps }}
 
@@ -465,6 +478,7 @@ jobs:
 
     steps:
       - ${{ parameters.initSteps }}
+      - ${{ parameters.pythonInitSteps }}
       - ${{ parameters.macInitSteps }}
       - ${{ parameters.pythonBuildSteps }}
       - ${{ parameters.pythonCoverageSteps }}
@@ -483,6 +497,7 @@ jobs:
 
     steps:
       - ${{ parameters.initSteps }}
+      - ${{ parameters.pythonInitSteps }}
       - ${{ parameters.macInitSteps }}
       - ${{ parameters.pythonBuildSteps }}
       - ${{ parameters.pythonCoverageSteps }}
@@ -510,15 +525,8 @@ jobs:
       - bash: yarn --frozen-lockfile
         displayName: "Install Javascript Dependencies"
 
-      - task: UsePythonVersion@0
-        inputs:
-          versionSpec: "$(python.version)"
-          architecture: "x64"
-        displayName: "Use Python $(python.version)"
-
-      - bash: python -m pip install --upgrade pip wheel setuptools jupyterlab numpy "pyarrow>=5" "black==20.8b1" flake8-black
-        displayName: "Install Python base dependencies"
-        condition: succeeded()
+      - ${{ parameters.pythonInitSteps }}
+      - ${{ parameters.wasmInitSteps }}
 
       - task: DownloadPipelineArtifact@2
         displayName: "Download Python 3.7 Perspective Wheel"

diff --git a/python/perspective/MANIFEST.in b/python/perspective/MANIFEST.in
@@ -8,10 +8,7 @@ include Makefile
 
 # Source files for perspective-python
 graft perspective
-include perspective/table/*.so
-include perspective/table/*.dll
-include perspective/table/*.dylib
-include perspective/table/*.pyd
+recursive-include perspective/table/
 
 graft perspective/tests
 

diff --git a/scripts/_wheel_python.js b/scripts/_wheel_python.js
@@ -78,7 +78,7 @@ try {
         cmd += `rm -rf build/ &&`;
 
         // now build the wheel in place
-        cmd += `${PYTHON} setup.py bdist_wheel`;
+        cmd += `${PYTHON} setup.py build_ext bdist_wheel`;
 
         // Use auditwheel on Linux - repaired wheels are in
         // `python/perspective/wheelhouse`.
@@ -87,11 +87,11 @@ try {
     } else if (IS_MACOS) {
         // Don't need to do any cleaning here since we will reuse the cmake
         // cache and numpy paths from the pep-517/518 build in build_python.js
-        cmd += `${PYTHON} setup.py bdist_wheel`;
+        cmd += `${PYTHON} setup.py build_ext bdist_wheel`;
         cmd += " && mkdir -p ./wheelhouse && cp -v ./dist/*.whl ./wheelhouse";
     } else {
         // Windows
-        cmd += `${PYTHON} setup.py bdist_wheel`;
+        cmd += `${PYTHON} setup.py build_ext bdist_wheel`;
     }
 
     // TODO: MacOS wheel processed with delocate segfaults on