Skip to content

Commit

Permalink
Revert "Bump pyo3 from 0.12.4 to 0.13.1 (Qiskit#224)" (Qiskit#237)
Browse files Browse the repository at this point in the history
This commit reverts the version bumps for pyo3, numpy, and ndarray. The
3 changes here required increasing the minimum supported rust version
from 1.39.0 to 1.45.0. While for most developers and use cases this is
fine since 1.45.0 is > 6 months old and most packagers/distributors keep
the rust version up-to-date. One known exception to this though is the
debian 10 rustc package is at 1.41.0. This becomes an issue for
raspberry pi users running a 32bit operating system (the aarch64
manylinux wheels on PyPI work fine for 64bit OS rasberry pi users).
The piwheels project is using the debian 10 package which means to
provide prebuilt wheels of retworkx they need to be able to use rustc
1.41.0 to build.

When weighing the features of this version bump (the big thing for our
use case are better type error messages when calling retworkx from
python) that this version bump would require all raspberry pi users
to switch back to building retworkx from source on 32bit Raspberry Pi OS
when retworkx on piwheels was only a recent addition we should wait at
least one more release before bumping the minimum support rust version.
Hopefully the debian rustc version will be bumped to >=1.45.0 at some
point soon and then this issue goes away.

This reverts commit a3249f0.
  • Loading branch information
mtreinish authored Jan 23, 2021
1 parent 0cd2769 commit fad5320
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 38 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.45.0
- rust: 1.39.0
python-version: 3.8
platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
msrv: "MSRV"
Expand Down
81 changes: 57 additions & 24 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.13.0"
numpy = "0.12.1"
rand = "0.8"
rand_pcg = "0.3"
rayon = "1.5"

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

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

[dependencies.ndarray]
version = "^0.14.0"
version = "^0.13.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.45](https://img.shields.io/badge/rustc-1.45+-blue.svg)](https://rust-lang.github.io/rfcs/2495-min-rust-version.html)
[![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)

- 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.45 installed (and
from the published source package you need to have rust >=1.39 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: 0 additions & 8 deletions releasenotes/notes/bump-msrv-d581a8cbeff8915b.yaml

This file was deleted.

0 comments on commit fad5320

Please sign in to comment.