From 815ebac8f9eabc17b7cb790fb97612a12e09ca52 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Thu, 27 Feb 2025 13:02:46 +0800 Subject: [PATCH] Fix building wheels for Python 3.7 (#1933) --- .github/workflows/build-wheels-linux-cuda.yaml | 6 +++++- .github/workflows/build-wheels-macos-x64.yaml | 6 +++++- .github/workflows/build-wheels-win64.yaml | 7 ++++++- .github/workflows/test-go-package.yaml | 2 +- .github/workflows/test-go.yaml | 2 +- scripts/go/release.sh | 1 + 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheels-linux-cuda.yaml b/.github/workflows/build-wheels-linux-cuda.yaml index 1801840a..1b2c68a7 100644 --- a/.github/workflows/build-wheels-linux-cuda.yaml +++ b/.github/workflows/build-wheels-linux-cuda.yaml @@ -34,7 +34,11 @@ jobs: - name: Install Python dependencies shell: bash run: | - pip install -U pip wheel setuptools twine==5.0.0 + if [[ ${{ matrix.python-version }} == "3.7" ]]; then + pip install -U pip wheel setuptools twine + else + pip install -U pip wheel setuptools twine==5.0.0 + fi - name: Build alsa-lib shell: bash diff --git a/.github/workflows/build-wheels-macos-x64.yaml b/.github/workflows/build-wheels-macos-x64.yaml index cbb4792e..89ea4788 100644 --- a/.github/workflows/build-wheels-macos-x64.yaml +++ b/.github/workflows/build-wheels-macos-x64.yaml @@ -110,6 +110,10 @@ jobs: fi python3 -m pip install $opts --upgrade pip - python3 -m pip install $opts wheel twine==5.0.0 setuptools + if [[ ${{ matrix.python-version }} == "cp37" ]]; then + python3 -m pip install $opts wheel twine setuptools + else + python3 -m pip install $opts wheel twine==5.0.0 setuptools + fi twine upload ./wheelhouse/*.whl diff --git a/.github/workflows/build-wheels-win64.yaml b/.github/workflows/build-wheels-win64.yaml index f2cc7c15..5a80e535 100644 --- a/.github/workflows/build-wheels-win64.yaml +++ b/.github/workflows/build-wheels-win64.yaml @@ -89,11 +89,16 @@ jobs: git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-wheels main - name: Publish wheels to PyPI + shell: bash env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | python3 -m pip install --upgrade pip - python3 -m pip install wheel twine==5.0.0 setuptools + if [[ ${{ matrix.python-version }} == "3.7" ]]; then + python3 -m pip install wheel twine setuptools + else + python3 -m pip install wheel twine==5.0.0 setuptools + fi twine upload ./wheelhouse/*.whl diff --git a/.github/workflows/test-go-package.yaml b/.github/workflows/test-go-package.yaml index f587032e..12eaa69d 100644 --- a/.github/workflows/test-go-package.yaml +++ b/.github/workflows/test-go-package.yaml @@ -43,7 +43,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v5 with: - go-version: '>=1.12' + go-version: '>=1.17' - name: Display go version shell: bash diff --git a/.github/workflows/test-go.yaml b/.github/workflows/test-go.yaml index ffffa9d9..c3b9043e 100644 --- a/.github/workflows/test-go.yaml +++ b/.github/workflows/test-go.yaml @@ -47,7 +47,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: '>=1.12' + go-version: '>=1.17' - name: Display go version shell: bash diff --git a/scripts/go/release.sh b/scripts/go/release.sh index 6d4b4c72..60ffd91c 100755 --- a/scripts/go/release.sh +++ b/scripts/go/release.sh @@ -17,6 +17,7 @@ echo "SHERPA_ONNX_VERSION $SHERPA_ONNX_VERSION" function linux() { echo "Process linux" git clone git@github.com:k2-fsa/sherpa-onnx-go-linux.git + rm -v ./sherpa-onnx-go-linux/*.go cp -v ./sherpa_onnx.go ./sherpa-onnx-go-linux/