This is an automated email from the ASF dual-hosted git repository. chaokunyang pushed a commit to tag v0.12.0-a1 in repository https://gitbox.apache.org/repos/asf/fory.git
commit ad2cd47f64ffac706b62734ae519a93f63e06c83 Author: chaokunyang <[email protected]> AuthorDate: Fri Aug 15 14:02:58 2025 +0800 fix macos wheel --- .github/workflows/release.yaml | 2 +- ci/deploy.sh | 25 ++++++++----------------- python/pyproject.toml | 2 +- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0d3728421..5025b5ba1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -32,7 +32,7 @@ jobs: strategy: matrix: python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13] - os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-14, windows-2022] # macos-13: x86, macos-14: arm64 + os: [ubuntu-latest, ubuntu-24.04-arm, macos-14, windows-2022] # macos-13: x86, macos-14: arm64 env: manylinux_x86_64_image: quay.io/pypa/manylinux_2_28_x86_64 manylinux_aarch64_image: quay.io/pypa/manylinux_2_28_aarch64 diff --git a/ci/deploy.sh b/ci/deploy.sh index 7de5af5a3..5b7fc8181 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -72,7 +72,13 @@ build_pyfory() { # Fix strange installed deps not found pip install setuptools -U - python setup.py bdist_wheel --dist-dir=../dist + if [[ "$OSTYPE" == "darwin"* ]]; then + export MACOSX_DEPLOYMENT_TARGET=12.0 + python setup.py bdist_wheel --plat-name macosx_12_0_universal2 --dist-dir=../dist + else + python setup.py bdist_wheel --dist-dir=../dist + fi + ls -l ../dist if [ -n "$PLAT" ]; then @@ -83,22 +89,7 @@ build_pyfory() { auditwheel repair ../dist/pyfory-*-linux_*.whl --plat "$PLAT" --exclude '*arrow*' --exclude '*parquet*' --exclude '*numpy*' -w ../dist/ rm ../dist/pyfory-*-linux_*.whl elif [[ "$OSTYPE" == "darwin"* ]]; then - # Check macOS version - MACOS_VERSION=$(sw_vers -productVersion | cut -d. -f1-2) - if [[ "$MACOS_VERSION" == "13"* ]]; then - # Check if wheel ends with x86_64.whl - for wheel in ../dist/pyfory-*-macosx*.whl; do - if [[ "$wheel" == *"x86_64.whl" ]]; then - echo "Fixing wheel tags for x86_64 wheel: $wheel" - wheel tags --platform-tag macosx_12_0_x86_64 "$wheel" - else - echo "Skipping wheel tags for non-x86_64 wheel: $wheel" - fi - done - else - # Other macOS versions: skip wheel repair - echo "Skipping wheel repair for macOS $MACOS_VERSION" - fi + echo "Skip macos wheel repair" elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then echo "Skip windows wheel repair" fi diff --git a/python/pyproject.toml b/python/pyproject.toml index a18aa7b61..58b81674e 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -59,7 +59,7 @@ all = ["pyarrow"] dev = ["ruff"] [tool.setuptools] -packages = ["pyfory", "pyfory.format", "pyfory.lib", "pyfory.meta"] +packages = ["pyfory", "pyfory.format", "pyfory.lib", "pyfory.lib.mmh3", "pyfory.meta"] include-package-data = true zip-safe = false --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
