diff --git a/.github/workflows/build-cibuildwheel.yml b/.github/workflows/build-cibuildwheel.yml index 847c00f..e129ebd 100644 --- a/.github/workflows/build-cibuildwheel.yml +++ b/.github/workflows/build-cibuildwheel.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v4 @@ -58,9 +58,6 @@ jobs: CIBW_BEFORE_ALL_MACOS: | brew install boost zeromq openblas cmake - CIBW_BEFORE_ALL_WINDOWS: | - choco install cmake -y - # Test the wheel CIBW_TEST_COMMAND: | python -c "import leann_backend_hnsw; print('HNSW backend imported successfully')" @@ -68,6 +65,8 @@ jobs: # Environment variables for build CIBW_ENVIRONMENT: | CMAKE_BUILD_PARALLEL_LEVEL=8 + Python_FIND_VIRTUALENV=ONLY + Python3_FIND_VIRTUALENV=ONLY - name: Build leann-backend-diskann wheels uses: pypa/cibuildwheel@v2.20.0 @@ -88,14 +87,13 @@ jobs: CIBW_BEFORE_ALL_MACOS: | brew install boost zeromq openblas cmake - CIBW_BEFORE_ALL_WINDOWS: | - choco install cmake -y - CIBW_TEST_COMMAND: | python -c "import leann_backend_diskann; print('DiskANN backend imported successfully')" CIBW_ENVIRONMENT: | CMAKE_BUILD_PARALLEL_LEVEL=8 + Python_FIND_VIRTUALENV=ONLY + Python3_FIND_VIRTUALENV=ONLY - uses: actions/upload-artifact@v4 with: diff --git a/packages/leann-backend-diskann/pyproject.toml b/packages/leann-backend-diskann/pyproject.toml index 1c63600..4611370 100644 --- a/packages/leann-backend-diskann/pyproject.toml +++ b/packages/leann-backend-diskann/pyproject.toml @@ -21,7 +21,4 @@ wheel.exclude = ["CMakeLists.txt", "src", "third_party/**", "*.o", "*.so"] sdist.include = ["CMakeLists.txt", "src", "third_party", "leann_backend_diskann/*.txt"] [tool.scikit-build.cmake.define] -CMAKE_BUILD_PARALLEL_LEVEL = "8" -# Help CMake find Python in cibuildwheel environments -Python_FIND_VIRTUALENV = "ONLY" -Python3_FIND_VIRTUALENV = "ONLY" \ No newline at end of file +CMAKE_BUILD_PARALLEL_LEVEL = "8" \ No newline at end of file diff --git a/packages/leann-backend-hnsw/pyproject.toml b/packages/leann-backend-hnsw/pyproject.toml index 16e97e3..8f6f7d1 100644 --- a/packages/leann-backend-hnsw/pyproject.toml +++ b/packages/leann-backend-hnsw/pyproject.toml @@ -24,7 +24,4 @@ cmake.verbose = true # CMake definitions to optimize compilation [tool.scikit-build.cmake.define] -CMAKE_BUILD_PARALLEL_LEVEL = "8" -# Help CMake find Python in cibuildwheel environments -Python_FIND_VIRTUALENV = "ONLY" -Python3_FIND_VIRTUALENV = "ONLY" \ No newline at end of file +CMAKE_BUILD_PARALLEL_LEVEL = "8" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 2fdd41b..ac58cf1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -79,7 +79,3 @@ before-all = """ # macOS系统依赖 [tool.cibuildwheel.macos] before-all = "brew install boost zeromq openblas cmake" - -# Windows系统依赖 -[tool.cibuildwheel.windows] -before-all = "choco install cmake -y"