From 033dc7a62b5742a2f6febc91685a6bf446b44fc1 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Tue, 16 Mar 2021 09:51:43 -0400
Subject: [PATCH] Use rust-numpy 0.13.1 and bumpy MSRV to 1.41.1

As a conclusion to PyO3/rust-numpy#146 the MSRV for rust-numpy was
defined as matching PyO3 and being 1.41.1. The rust-numpy 0.13.1
release handled this and relaxed it's dependency on upstream
dependencies (namely ndarray) to enable building with rust 1.41.1. Since
rust 1.41.1 is what is shipped with Debian buster it will work for
retworkx (so we don't block piwheels which relies on the debian rustc
package). This commit bumps the rust-numpy version to the latest release
and correspondingly bumps the MSRV to match at 1.41.1 which also unblocks
the use of the latest PyO3 release.
---
 .github/workflows/main.yml |  2 +-
 Cargo.lock                 | 46 ++++----------------------------------
 Cargo.toml                 |  2 +-
 README.md                  |  4 ++--
 4 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6287eaadf..b1fec8c8b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
         ]
         include:
           # Test minimal supported Rust version
-          - rust: 1.39.0
+          - rust: 1.41.1
             python-version: 3.8
             platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu" }
             msrv: "MSRV"
diff --git a/Cargo.lock b/Cargo.lock
index 613eb7502..08c537600 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -337,16 +337,16 @@ dependencies = [
 
 [[package]]
 name = "numpy"
-version = "0.12.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fd9e8e652becf4ba6c11803945f8bf463c23f482f704bb33f70ae9d22482d10"
+checksum = "a7073fae1e0b82409533a29c6f804b79783d7b2d3c07728fdc4d884eda8cd4f0"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
  "ndarray",
  "num-complex",
  "num-traits",
- "pyo3 0.12.4",
+ "pyo3",
 ]
 
 [[package]]
@@ -424,22 +424,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "pyo3"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf6bbbe8f70d179260b3728e5d04eb012f4f0c7988e58c11433dd689cecaa72e"
-dependencies = [
- "ctor",
- "indoc",
- "inventory",
- "libc",
- "parking_lot",
- "paste",
- "pyo3cls",
- "unindent",
-]
-
 [[package]]
 name = "pyo3"
 version = "0.13.2"
@@ -458,17 +442,6 @@ dependencies = [
  "unindent",
 ]
 
-[[package]]
-name = "pyo3-derive-backend"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10ecd0eb6ed7b3d9965b4f4370b5b9e99e3e5e8742000e1c452c018f8c2a322f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "pyo3-macros"
 version = "0.13.2"
@@ -491,17 +464,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "pyo3cls"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d344fdaa6a834a06dd1720ff104ea12fe101dad2e8db89345af9db74c0bb11a0"
-dependencies = [
- "pyo3-derive-backend",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.9"
@@ -609,7 +571,7 @@ dependencies = [
  "ndarray",
  "numpy",
  "petgraph",
- "pyo3 0.13.2",
+ "pyo3",
  "rand",
  "rand_pcg",
  "rayon",
diff --git a/Cargo.toml b/Cargo.toml
index 7dab14d74..6fc95354a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ crate-type = ["cdylib"]
 [dependencies]
 petgraph = "0.5.1"
 fixedbitset = "0.2.0"
-numpy = "0.12.1"
+numpy = "0.13.1"
 rand = "0.8"
 rand_pcg = "0.3"
 rayon = "1.5"
diff --git a/README.md b/README.md
index 9eb9613d6..cc2a13333 100644
--- a/README.md
+++ b/README.md
@@ -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.41.1](https://img.shields.io/badge/rustc-1.41.19+-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>
@@ -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.41.1 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