From e9e5df3301aafc1a386c166b987f1e2ca9baf0c5 Mon Sep 17 00:00:00 2001 From: Wenjun Si Date: Fri, 10 Nov 2023 18:48:51 +0800 Subject: [PATCH] Adapt to PyPI 2FA --- .github/workflows/pypi-cd.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pypi-cd.yml b/.github/workflows/pypi-cd.yml index 30b911f..a9a9194 100644 --- a/.github/workflows/pypi-cd.yml +++ b/.github/workflows/pypi-cd.yml @@ -31,15 +31,14 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v1.11.1 env: - CIBW_BUILD_VERBOSITY: "1" CIBW_BEFORE_BUILD: pip install -r requirements-wheel.txt CIBW_ARCHS: ${{ matrix.arch }} CIBW_SKIP: pp* *-musllinux* *i686 cp35-manylinux_aarch64 cp36-manylinux_aarch64 CIBW_MANYLINUX_X86_64_IMAGE: manylinux1 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 - - name: Build wheels (Python 3.10) - uses: pypa/cibuildwheel@v2.3.1 + - name: "Build wheels (Python >= 3.10)" + uses: pypa/cibuildwheel@v2.14.1 env: CIBW_BEFORE_BUILD: pip install -r requirements-wheel.txt CIBW_ARCHS: ${{ matrix.arch }} @@ -47,6 +46,12 @@ jobs: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014 + - name: Install Python + uses: actions/setup-python@v4 + if: ${{ matrix.os == 'macos-latest'}} + with: + python-version: '3.7' + - name: Build source if: ${{ matrix.os == 'ubuntu-latest' && matrix.arch == 'auto'}} run: | @@ -56,7 +61,8 @@ jobs: - name: Release to pypi shell: bash env: - PYPI_PWD: ${{ secrets.PYPI_PASSWORD }} + TWINE_USERNAME: ${{ secrets.PYPI_USER }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | if [[ "$GITHUB_REPOSITORY" == "aliyun/aliyun-odps-python-sdk" ]]; then PYPI_REPO="https://upload.pypi.org/legacy/" @@ -68,8 +74,6 @@ jobs: echo " pypi" >> ~/.pypirc echo "[pypi]" >> ~/.pypirc echo "repository=$PYPI_REPO" >> ~/.pypirc - echo "username=pyodps" >> ~/.pypirc - echo "password=$PYPI_PWD" >> ~/.pypirc python -m pip install twine python -m twine upload -r pypi --skip-existing wheelhouse/*