Merge branch 'main' of github.com:Qiskit/qiskit-terra into small_chan…

…ge_docs/3

Cargo.toml

@@ -1,15 +1,15 @@
 [workspace]
 members = ["crates/*"]
 
-# This has no meaning until we're on Rust 1.64, but once we get there, the subpackages will be able
-# to inherit from this rather than needing to duplicate its content themselves.  Until we get there,
-# keep this in sync with each subpackage `Cargo.toml`'s `package` key.
 [workspace.package]
 version = "0.45.0"
 edition = "2021"
-rust-version = "1.61"  # Keep in sync with README.md and rust-toolchain.toml.
+rust-version = "1.64"  # Keep in sync with README.md and rust-toolchain.toml.
 license = "Apache-2.0"
 
+[workspace.dependencies]
+pyo3 = { version = "0.19.2", features = ["extension-module", "abi3-py38"] }
+
 [profile.release]
 lto = 'fat'
 codegen-units = 1

README.md

@@ -1,5 +1,5 @@
 # Qiskit Terra
-[![License](https://img.shields.io/github/license/Qiskit/qiskit-terra.svg?style=popout-square)](https://opensource.org/licenses/Apache-2.0)<!--- long-description-skip-begin -->[![Release](https://img.shields.io/github/release/Qiskit/qiskit-terra.svg?style=popout-square)](https://github.com/Qiskit/qiskit-terra/releases)[![Downloads](https://img.shields.io/pypi/dm/qiskit-terra.svg?style=popout-square)](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)[![Minimum rustc 1.61.0](https://img.shields.io/badge/rustc-1.61.0+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)<!--- long-description-skip-end -->
+[![License](https://img.shields.io/github/license/Qiskit/qiskit-terra.svg?style=popout-square)](https://opensource.org/licenses/Apache-2.0)<!--- long-description-skip-begin -->[![Release](https://img.shields.io/github/release/Qiskit/qiskit-terra.svg?style=popout-square)](https://github.com/Qiskit/qiskit-terra/releases)[![Downloads](https://img.shields.io/pypi/dm/qiskit-terra.svg?style=popout-square)](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)[![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)<!--- long-description-skip-end -->
 
 **Qiskit** is an open-source framework for working with noisy quantum computers at the level of pulses, circuits, and algorithms.
 

crates/accelerate/Cargo.toml

@@ -1,11 +1,9 @@
 [package]
 name = "qiskit_accelerate"
-# The following options can be inherited with (e.g.) `version.workspace = true` once we hit Rust
-# 1.64.  Until then, keep in sync with the root `Cargo.toml`.
-version = "0.45.0"
-edition = "2021"
-rust-version = "1.61"
-license = "Apache-2.0"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
 
 [lib]
 name = "qiskit_accelerate"
@@ -22,11 +20,9 @@ num-complex = "0.4"
 num-bigint = "0.4"
 rustworkx-core = "0.13"
 
-# The base version of PyO3 and setting a minimum feature set (e.g. probably just 'extension-module')
-# can be done in the workspace and inherited once we hit Rust 1.64.
 [dependencies.pyo3]
-version = "0.19.2"
-features = ["extension-module", "hashbrown", "indexmap", "num-complex", "num-bigint", "abi3-py38"]
+workspace = true
+features = ["hashbrown", "indexmap", "num-complex", "num-bigint"]
 
 [dependencies.ndarray]
 version = "^0.15.6"