Skip to content

Commit

Permalink
Merge branch 'Qiskit:main' into #7078-change-prefix-for-MemorySlot
Browse files Browse the repository at this point in the history
  • Loading branch information
pollyshaw authored Jun 30, 2022
2 parents dc47600 + fe8ab43 commit bbba545
Show file tree
Hide file tree
Showing 673 changed files with 14,339 additions and 7,243 deletions.
8 changes: 8 additions & 0 deletions .azure/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ parameters:
type: boolean
default: false

- name: "rustVersion"
type: string
default: "stable"


jobs:
- job: "Linux_Tests_Python${{ replace(parameters.pythonVersion, '.', '') }}"
Expand Down Expand Up @@ -52,6 +56,10 @@ jobs:
path: .stestr
displayName: "Cache stestr"

- bash: |
rustup default "${{ parameters.rustVersion }}"
displayName: "Use rust version ${{ parameters.rustVersion }}"
- bash: |
set -e
python -m pip install --upgrade pip setuptools wheel virtualenv
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/neko.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Qiskit Neko Integration Tests
on:
push:
pull_request:
branches: ['main', 'stable/*']
concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
cancel-in-progress: true
jobs:
neko:
name: Qiskit Neko Integration Tests
runs-on: ubuntu-latest
steps:
- uses: Qiskit/qiskit-neko@main
with:
test_selection: terra
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ pull_request_rules:
actions:
backport:
branches:
- stable/0.20
- stable/0.21
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ the Visual C++ build tools so that rust can link against the system c/c++
libraries. You can see more details on this in the
[rustup documentation](https://rust-lang.github.io/rustup/installation/windows.html).

Qiskit Terra has a minimum supported Rust version (MSRV) of 1.56.1. This means
to build Qiskit Terra from source you must have at least rustc version 1.56.1
installed, older versions will not be able to compile Qiskit.

Once you have a rust compiler installed you can rely on the normal Python
build/install steps to install Qiskit Terra. This means you just run
`pip install .` in your local git clone to build and install Qiskit Terra.
Expand Down
Loading

0 comments on commit bbba545

Please sign in to comment.