From eaebfbc793593f988819e6086b00ed6fb71958fd Mon Sep 17 00:00:00 2001 From: Jake Lishman Date: Fri, 27 Sep 2024 11:55:35 +0100 Subject: [PATCH] DNM: reploy failed 0.46.3 artifacts The Linux x86-64 wheel, Windows 64- and 32-bit wheels, the `qiskit-terra` sdist and the `qiskit` metapackage all failed to upload, though the other seven wheels succeeded. This retriggers CD to reploy them. --- .github/workflows/wheels.yml | 139 +---------------------------------- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 136 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e40d2dfb98f1..c1d80422bf3d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -2,8 +2,8 @@ name: Wheel Builds on: push: - tags: - - '*' + branches: ["redeploy-0.46.3"] + jobs: build_wheels: name: Build wheels @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-12, windows-latest] + os: [ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -20,49 +20,19 @@ jobs: with: python-version: '3.10' - uses: dtolnay/rust-toolchain@stable - if: runner.os != 'macOS' - - uses: dtolnay/rust-toolchain@1.73 - if: runner.os == 'macOS' - name: Build wheels uses: pypa/cibuildwheel@v2.19.2 - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl name: wheels-${{ matrix.os }} - build_wheels_macos_arm: - name: Build wheels on macOS arm - runs-on: ${{ matrix.os }} - environment: release - strategy: - fail-fast: false - matrix: - os: [macos-12] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable - - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 - env: - CIBW_BEFORE_ALL: rustup target add aarch64-apple-darwin - CIBW_ARCHS_MACOS: arm64 universal2 - CIBW_ENVIRONMENT: >- - CARGO_BUILD_TARGET="aarch64-apple-darwin" - PYO3_CROSS_LIB_DIR="/Library/Frameworks/Python.framework/Versions/$(python -c 'import sys; print(str(sys.version_info[0])+"."+str(sys.version_info[1]))')/lib/python$(python -c 'import sys; print(str(sys.version_info[0])+"."+str(sys.version_info[1]))')" - - uses: actions/upload-artifact@v4 - with: - path: ./wheelhouse/*.whl - name: wheels-${{ matrix.os }}-arm upload_shared_wheels: name: Upload shared build wheels runs-on: ubuntu-latest environment: release permissions: id-token: write - needs: ["build_wheels", "build_wheels_macos_arm"] + needs: ["build_wheels"] steps: - uses: actions/download-artifact@v4 with: @@ -73,107 +43,6 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: packages-dir: deploy - build_wheels_s390x: - name: Build wheels on s390x - runs-on: ${{ matrix.os }} - environment: release - permissions: - id-token: write - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: all - - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 - env: - CIBW_ARCHS_LINUX: s390x - CIBW_TEST_SKIP: "cp*" - - uses: actions/upload-artifact@v4 - with: - name: wheels-${{ matrix.os }}-s390x - path: ./wheelhouse/*.whl - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: wheelhouse/ - build_wheels_ppc64le: - name: Build wheels on ppc64le - runs-on: ${{ matrix.os }} - environment: release - permissions: - id-token: write - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: all - - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 - env: - CIBW_ARCHS_LINUX: ppc64le - CIBW_TEST_SKIP: "cp*" - - uses: actions/upload-artifact@v4 - with: - name: wheels-${{ matrix.os }}-ppc64le - path: ./wheelhouse/*.whl - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: wheelhouse/ - build_wheels_aarch64: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - environment: release - permissions: - id-token: write - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: all - - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 - env: - CIBW_ARCHS_LINUX: aarch64 - - uses: actions/upload-artifact@v4 - with: - name: wheels-${{ matrix.os }}-aarch64 - path: ./wheelhouse/*.whl - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: wheelhouse/ sdist: name: Build and publish terra sdist runs-on: ${{ matrix.os }} diff --git a/pyproject.toml b/pyproject.toml index a0ba2019dc81..276713288d72 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ target-version = ['py38', 'py39', 'py310', 'py311'] [tool.cibuildwheel] manylinux-x86_64-image = "manylinux2014" manylinux-i686-image = "manylinux2014" -skip = "pp* cp36-* cp37-* *musllinux*" +skip = "pp* cp36-* cp37-* *musllinux* *_i686" test-skip = "cp310-win32 cp310-manylinux_i686 cp311-win32 cp311-manylinux_i686 cp312-win32 cp312-manylinux_i686" test-command = "python {project}/examples/python/stochastic_swap.py" # We need to use pre-built versions of Numpy and Scipy in the tests; they have a