Skip to content

Commit

Permalink
Revert "Revert "Bump pyo3 from 0.12.4 to 0.13.1 (Qiskit#224)""
Browse files Browse the repository at this point in the history
This commit restores the PyO3, rust-numpy, and ndarray bump to the
latest versions. This was previously reverted in Qiskit#237 to avoid the
increase in the minimum supported rust version to enable builds on
piwheels. However, now that 0.8.0 has been released I think it's fine to
bump now.

This reverts commit 3beb8fb.
  • Loading branch information
mtreinish committed Jan 23, 2021
1 parent fad5320 commit bea51f9
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
]
include:
# Test minimal supported Rust version
- rust: 1.39.0
- rust: 1.45.0
python-version: 3.8
platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
msrv: "MSRV"
Expand Down
77 changes: 22 additions & 55 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ crate-type = ["cdylib"]
[dependencies]
petgraph = "0.5.1"
fixedbitset = "0.2.0"
numpy = "0.12.1"
numpy = "0.13.0"
rand = "0.8"
rand_pcg = "0.3"
rayon = "1.5"

[dependencies.pyo3]
version = "0.12.3"
version = "0.13.0"
features = ["extension-module", "hashbrown"]

[dependencies.hashbrown]
version = "0.9"
features = ["rayon"]

[dependencies.ndarray]
version = "^0.13.0"
version = "^0.14.0"
features = ["rayon"]

[profile.release]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![](https://img.shields.io/github/release/Qiskit/retworkx.svg?style=popout-square)](https://github.com/Qiskit/retworkx/releases)
[![](https://img.shields.io/pypi/dm/retworkx.svg?style=popout-square)](https://pypi.org/project/retworkx/)
[![Coverage Status](https://coveralls.io/repos/github/Qiskit/retworkx/badge.svg?branch=master)](https://coveralls.io/github/Qiskit/retworkx?branch=master)
[![Minimum rustc 1.39](https://img.shields.io/badge/rustc-1.39+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
[![Minimum rustc 1.45](https://img.shields.io/badge/rustc-1.45+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)

- You can see the full rendered docs at:
<https://retworkx.readthedocs.io/en/latest/index.html>
Expand Down Expand Up @@ -37,7 +37,7 @@ environment.

If there are no precompiled binaries published for your system you'll have to
build the package from source. However, to be able able to build the package
from the published source package you need to have rust >=1.39 installed (and
from the published source package you need to have rust >=1.45 installed (and
also [cargo](https://doc.rust-lang.org/cargo/) which is normally included with
rust) You can use [rustup](https://rustup.rs/) (a cross platform installer for
rust) to make this simpler, or rely on
Expand Down
8 changes: 8 additions & 0 deletions releasenotes/notes/bump-msrv-d581a8cbeff8915b.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
upgrade:
- |
The minimum supported Rust version has increased to 1.45.0, you will need
rustc >=1.45.0 now to build retworkx. The previous minimum supported Rust
version 1.39.0 will no longer be able to compile retworkx. This is due to a
change in in the new version of the `pyo3 <https://github.com/PyO3/pyo3>`__
library which is used to build the Python bindings.

0 comments on commit bea51f9

Please sign in to comment.