From 98e4e2e6aa9797317261be9eccb795ccd236a4f6 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Fri, 12 Jun 2020 07:53:11 -0400
Subject: [PATCH 1/2] Temporarily pin nightly version used for builds

In the most recent nightly build of cargo a regression slipped in around
handling of READMEs in published crates [1]. Unfortunately this breaks CI
builds because a 3rd level dependency (pyo3->inventory->ctor) triggers
this regression. The issue has been corrected in cargo and the next
nightly should fix this. However, to unblock things in the meantime this
commit pins the nightly version to a known working version. We can
simply revert this after the fix has been released.

[1] https://github.com/rust-lang/cargo/issues/8351
---
 .travis.yml         |  2 +-
 azure-pipelines.yml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16dcc1642..f2cefff99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ jobs:
       install: echo ""
       before_script:
         - rustup update
-        - rustup override set nightly
+        - rustup override set nightly-2020-06-10
       script:
         - cargo build
         - cargo +stable fmt -- --check
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2ec9bf808..89a4a0a33 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,7 +19,7 @@ stages:
       pool: {vmImage: 'macOS-10.15'}
       variables:
         python.version: '3.7'
-        CIBW_BEFORE_BUILD: pip install -U setuptools-rust && rustup default nightly
+        CIBW_BEFORE_BUILD: pip install -U setuptools-rust && rustup default nightly-2020-06-10
         CIBW_SKIP: cp27-* cp34-* pp*
         TWINE_USERNAME: retworkx-ci
         CIBW_TEST_COMMAND: python -m unittest discover {project}/tests
@@ -43,7 +43,7 @@ stages:
       pool: {vmImage: 'vs2017-win2016'}
       condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
       variables:
-        CIBW_BEFORE_BUILD: rustup default nightly && pip install -U setuptools-rust
+        CIBW_BEFORE_BUILD: rustup default nightly-2020-06-10 && pip install -U setuptools-rust
         CIBW_SKIP: cp27-* cp34-* pp* *win32
         TWINE_USERNAME: retworkx-ci
         CIBW_TEST_COMMAND: python -m unittest discover {project}/tests
@@ -65,7 +65,7 @@ stages:
       pool: {vmImage: 'vs2017-win2016'}
       condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
       variables:
-        CIBW_BEFORE_BUILD: rustup default nightly-i686-pc-windows-msvc && pip install -U setuptools-rust
+        CIBW_BEFORE_BUILD: rustup default nightly-i686-pc-windows-msvc-2020-06-10 && pip install -U setuptools-rust
         CIBW_SKIP: cp27-* cp34-* pp* *amd64
         TWINE_USERNAME: retworkx-ci
         CIBW_TEST_COMMAND: python -m unittest discover {project}/tests
@@ -100,7 +100,7 @@ stages:
           inputs:
             versionSpec: '$(python.version)'
           displayName: 'Use Python $(python.version)'
-        - bash: rustup default nightly
+        - bash: rustup default nightly-2020-06-10
           displayName: 'Install Rust'
         - bash: python -m pip install --upgrade pip setuptools virtualenv setuptools-rust
           displayName: 'Install dependencies'
@@ -126,7 +126,7 @@ stages:
           inputs:
             versionSpec: '$(python.version)'
           displayName: 'Use Python $(python.version)'
-        - bash: rustup default nightly
+        - bash: rustup default nightly-2020-06-10
           displayName: 'Install Rust'
         - bash: |
             set -e
@@ -165,7 +165,7 @@ stages:
           inputs:
             versionSpec: '$(python.version)'
           displayName: 'Use Python $(python.version)'
-        - bash: rustup default nightly
+        - bash: rustup default nightly-2020-06-10
           displayName: 'Install Rust'
         - bash: python -m pip install --upgrade pip setuptools virtualenv setuptools-rust
           displayName: 'Install dependencies'
@@ -195,7 +195,7 @@ stages:
           inputs:
             versionSpec: '$(python.version)'
           displayName: 'Use Python $(python.version)'
-        - bash: rustup default nightly
+        - bash: rustup default nightly-2020-06-10
           displayName: 'Install Rust'
         - bash: |
             set -e

From 1e6d4f99f400801f65ca924c64e4f39d2a071fe1 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Fri, 12 Jun 2020 08:01:19 -0400
Subject: [PATCH 2/2] Actually pin python jobs

---
 tools/install_rust.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install_rust.sh b/tools/install_rust.sh
index 1a7d3c84b..77363aa26 100755
--- a/tools/install_rust.sh
+++ b/tools/install_rust.sh
@@ -1,5 +1,5 @@
 if [ ! -d rust-installer ]; then
     mkdir rust-installer
     wget https://sh.rustup.rs -O rust-installer/rustup.sh
-    sh rust-installer/rustup.sh --default-toolchain nightly -y
+    sh rust-installer/rustup.sh --default-toolchain nightly-2020-06-10 -y
 fi