Skip to content

Commit

Permalink
Merge branch 'main' into ComplexAmp
Browse files Browse the repository at this point in the history
  • Loading branch information
TsafrirA authored Jan 10, 2024
2 parents dc951db + b8d21ae commit 66701c0
Show file tree
Hide file tree
Showing 124 changed files with 4,232 additions and 1,874 deletions.
5 changes: 1 addition & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,14 @@
* @Qiskit/terra-core

# Qiskit folders (also their corresponding tests)
algorithms/ @Qiskit/terra-core @woodsp-ibm @ElePT
opflow/ @Qiskit/terra-core @woodsp-ibm @ikkoham
qiskit/utils/ @Qiskit/terra-core @woodsp-ibm
providers/ @Qiskit/terra-core @jyu00
quantum_info/ @Qiskit/terra-core @ikkoham
qpy/ @Qiskit/terra-core
pulse/ @Qiskit/terra-core @eggerdj @wshanks
synthesis/ @Qiskit/terra-core @alexanderivrii @ShellyGarion
scheduler/ @Qiskit/terra-core @eggerdj @wshanks
visualization/ @Qiskit/terra-core @nonhermitian
primitives/ @Qiskit/terra-core @ikkoham @t-imamichi
primitives/ @Qiskit/terra-core @Qiskit/qiskit-primitives
# Override the release notes directories to have _no_ code owners, so any review
# from somebody with write access is acceptable.
/releasenotes/notes
14 changes: 7 additions & 7 deletions .github/workflows/randomized_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- name: Install dependencies
run: |
python -m pip install -U pip setuptools wheel
python -m pip install -U -r requirements.txt -c constraints.txt
python -m pip install -U -r requirements-dev.txt coveralls -c constraints.txt
python -m pip install -c constraints.txt -e .
python -m pip install "qiskit-ibmq-provider" -c constraints.txt
python -m pip install "qiskit-aer"
env:
SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
python -m pip install -U \
-c constraints.txt \
-r requirements.txt \
-r requirements-dev.txt \
coveralls \
qiskit-aer \
-e .
- name: Run randomized tests
run: make test_randomized
env:
Expand Down
66 changes: 32 additions & 34 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ resolver = "2"
[workspace.package]
version = "1.0.0"
edition = "2021"
rust-version = "1.64" # Keep in sync with README.md and rust-toolchain.toml.
rust-version = "1.70" # Keep in sync with README.md and rust-toolchain.toml.
license = "Apache-2.0"

[workspace.dependencies]
# This doesn't set `extension-module` as a shared feature because we need to be able to disable it
# during Rust-only testing (see # https://github.com/PyO3/pyo3/issues/340).
pyo3 = { version = "0.20.0", features = ["abi3-py38"] }
pyo3 = { version = "0.20.2", features = ["abi3-py38"] }

[profile.release]
lto = 'fat'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Downloads](https://img.shields.io/pypi/dm/qiskit-terra.svg)](https://pypi.org/project/qiskit-terra/)
[![Coverage Status](https://coveralls.io/repos/github/Qiskit/qiskit-terra/badge.svg?branch=main)](https://coveralls.io/github/Qiskit/qiskit-terra?branch=main)
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/qiskit)
[![Minimum rustc 1.64.0](https://img.shields.io/badge/rustc-1.64.0+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
[![Minimum rustc 1.70](https://img.shields.io/badge/rustc-1.70+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
[![Downloads](https://static.pepy.tech/badge/qiskit-terra)](https://pepy.tech/project/qiskit-terra)<!--- long-description-skip-end -->
[![DOI](https://zenodo.org/badge/161550823.svg)](https://zenodo.org/badge/latestdoi/161550823)

Expand Down
4 changes: 0 additions & 4 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# jsonschema pinning needed due nbformat==5.1.3 using deprecated behaviour in
# 4.0+. The pin can be removed after nbformat is updated.
jsonschema==3.2.0

# Scipy 1.11 seems to have caused an instability in the Weyl coordinates
# eigensystem code for one of the test cases. See
# https://github.com/Qiskit/qiskit-terra/issues/10345 for current details.
Expand Down
Loading

0 comments on commit 66701c0

Please sign in to comment.