Merge 1197e3a into f14e0b2

Qiskit · Apr 8, 2024 · defb678 · defb678
2 parents f14e0b2 + 1197e3a
commit defb678
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 71 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -1,14 +1,13 @@
 ---
 name: Wheel Builds
 on:
-  push:
-    tags:
-      - '*'
+  pull_request:
+    branches: '*'
+
 jobs:
   build_wheels:
     name: Build wheels
     runs-on: ${{ matrix.os }}
-    environment: release
     strategy:
       fail-fast: false
       matrix:
@@ -19,7 +18,7 @@ jobs:
         name: Install Python
         with:
           python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@1.70
         with:
           components: llvm-tools-preview
       - name: Build wheels
@@ -47,7 +46,7 @@ jobs:
         name: Install Python
         with:
           python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@1.70
         with:
           components: llvm-tools-preview
       - name: Build wheels
@@ -61,7 +60,6 @@ jobs:
   build_wheels_macos_arm:
     name: Build wheels on macOS arm
     runs-on: ${{ matrix.os }}
-    environment: release
     strategy:
       fail-fast: false
       matrix:
@@ -72,7 +70,7 @@ jobs:
         name: Install Python
         with:
           python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@1.70
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.17.0
         env:
@@ -85,27 +83,9 @@ jobs:
         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", "build_wheels_32bit"]
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: 'wheels-*'
-          merge-multiple: true
-          path: deploy
-      - name: Publish package distributions to PyPI
-        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:
@@ -118,7 +98,7 @@ jobs:
         name: Install Python
         with:
           python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@1.70
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -132,14 +112,9 @@ jobs:
         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:
@@ -152,7 +127,7 @@ jobs:
         name: Install Python
         with:
           python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@1.70
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -166,14 +141,9 @@ jobs:
         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:
@@ -186,7 +156,7 @@ jobs:
         name: Install Python
         with:
           python-version: '3.10'
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@1.70
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -199,30 +169,3 @@ jobs:
         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 sdist
-    runs-on: ${{ matrix.os }}
-    needs: ["upload_shared_wheels"]
-    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'
-      - name: Install deps
-        run: pip install -U build
-      - name: Build sdist
-        run: python -m build . --sdist
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/accelerate/Cargo.toml b/crates/accelerate/Cargo.toml
@@ -20,7 +20,7 @@ numpy = "0.21.0"
 rand = "0.8"
 rand_pcg = "0.3"
 rand_distr = "0.4.3"
-ahash = "0.8.6"
+ahash = "0.8.11"
 num-traits = "0.2"
 num-complex = "0.4"
 num-bigint = "0.4"

diff --git a/pyproject.toml b/pyproject.toml
@@ -148,11 +148,11 @@ before-test = "pip install --only-binary=numpy,scipy numpy scipy"
 # specific job override is needed. For example tier 1 platforms locally override
 # the before-build and environment configuration to enable PGO,
 # see: .github/workflows/wheels.yml for the jobs where this is done
-environment = 'RUSTUP_TOOLCHAIN="stable"'
+environment = 'RUSTUP_TOOLCHAIN="1.70"'
 
 [tool.cibuildwheel.linux]
 before-all = "yum install -y wget && {package}/tools/install_rust.sh"
-environment = 'PATH="$PATH:$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true" RUSTUP_TOOLCHAIN="stable"'
+environment = 'PATH="$PATH:$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true" RUSTUP_TOOLCHAIN="1.70"'
 repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel} && pipx run abi3audit --strict --report {wheel}"
 
 [tool.cibuildwheel.macos]