Skip to content

Commit

Permalink
Merge branch 'main' into goodbye-extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
Cryoris committed Jan 9, 2024
2 parents e5cf70f + d113a6a commit 0387894
Show file tree
Hide file tree
Showing 46 changed files with 998 additions and 283 deletions.
3 changes: 0 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
* @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
Expand Down
70 changes: 34 additions & 36 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.1", 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
2 changes: 1 addition & 1 deletion crates/accelerate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ numpy = "0.20.0"
rand = "0.8"
rand_pcg = "0.3"
rand_distr = "0.4.3"
ahash = "0.8.7"
ahash = "0.8.6"
num-complex = "0.4"
num-bigint = "0.4"
rustworkx-core = "0.13"
Expand Down
Loading

0 comments on commit 0387894

Please sign in to comment.