Skip to content

Commit

Permalink
Fix Repair wheels
Browse files Browse the repository at this point in the history
We probably need image repair

Update .so files to use manylinux version

Remove windows stuff and include only binary needed

Do not build musllinux images

Only add .so file on x86
  • Loading branch information
gaogaotiantian committed Feb 21, 2022
1 parent 8697875 commit 8ae68c9
Show file tree
Hide file tree
Showing 45 changed files with 35 additions and 50,567 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
run: python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_BUILD: 'cp${{ matrix.python-version }}-*'
CIBW_SKIP: '*musllinux*'
CIBW_ARCHS: ${{matrix.arch}}
CIBW_MANYLINUX_*_IMAGE: ${{ matrix.manylinux-image }}
CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.manylinux-image }}
Expand Down
45 changes: 32 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import setuptools
import sys
import platform
from distutils.core import Extension

with open("README.md") as f:
Expand All @@ -16,6 +17,36 @@
print("Can't find version! Stop Here!")
exit(1)

# Determine which attach binary to take into package
package_data = {
"viztracer": [
"html/*.js",
"html/*.css",
"html/*.html",
"web_dist/*",
"web_dist/*/*",
"web_dist/*/*/*",
"attach_process/__init__.py",
"attach_process/add_code_to_python_process.py",
"attach_process/LICENSE"
]
}

if sys.platform == "darwin":
package_data["viztracer"].extend([
"attach_process/attach_x86_64.dylib",
"attach_process/linux_and_mac/lldb_prepare.py"
])
elif sys.platform == "linux" or sys.platform == "linux2":
if platform.machine() == "i686":
package_data["viztracer"].extend([
"attach_process/attach_linux_x86.so"
])
elif platform.machine() == "x86_64":
package_data["viztracer"].extend([
"attach_process/attach_linux_amd64.so"
])

setuptools.setup(
name="viztracer",
version=version,
Expand All @@ -27,19 +58,7 @@
url="https://github.com/gaogaotiantian/viztracer",
packages=setuptools.find_packages("src"),
package_dir={"": "src"},
package_data={
"viztracer": [
"html/*.js",
"html/*.css",
"html/*.html",
"web_dist/*",
"web_dist/*/*",
"web_dist/*/*/*",
"attach_process/*",
"attach_process/*/*",
"attach_process/*/*/*",
]
},
package_data=package_data,
ext_modules=[
Extension(
"viztracer.snaptrace",
Expand Down
Binary file modified src/viztracer/attach_process/attach_linux_amd64.so
Binary file not shown.
Binary file modified src/viztracer/attach_process/attach_linux_x86.so
Binary file not shown.
263 changes: 0 additions & 263 deletions src/viztracer/attach_process/winappdbg/__init__.py

This file was deleted.

Loading

0 comments on commit 8ae68c9

Please sign in to comment.