Pass rust version to build-wheels-manylinux

Author: joar

Makefile

@@ -4,6 +4,7 @@ PY_RUN ?= pipenv run
 # extension module.
 RUSTCSV_BUILD_DEBUG ?= True
 RUSTCSV_BUILD_NATIVE ?= True
+RUSTCSV_RUST_VERSION ?= nightly
 MANYLINUX_IMAGE ?= quay.io/pypa/manylinux1_x86_64
 WHEEL_PYTHON_VERSIONS ?= cp36 cp37
 WHEELHOUSE = wheelhouse
@@ -87,7 +88,6 @@ benchmark: | develop-release
 		--benchmark-only \
 		--benchmark-timer $(PYTEST_BENCHMARK_TIMER) \
 		--benchmark-sort $(PYTEST_BENCHMARK_SORT) \
-		--benchmark-histogram \
 		--benchmark-autosave
 
 .PHONY: benchmark-full
@@ -133,6 +133,7 @@ build-wheels-manylinux: | requirements-files
 		-v $(shell pwd):/io \
 		--env RUSTCSV_BUILD_DEBUG=$(RUSTCSV_BUILD_DEBUG) \
 		--env RUSTCSV_BUILD_NATIVE=$(RUSTCSV_BUILD_NATIVE) \
+		--env RUSTCSV_RUST_VERSION=$(RUSTCSV_RUST_VERSION) \
 		--env WHEELHOUSE=/io/$(WHEELHOUSE) \
 		$(MANYLINUX_IMAGE) \
 		/io/travis/build-wheels-manylinux.sh $(WHEEL_PYTHON_VERSIONS)

travis/install-rust.sh

@@ -5,16 +5,16 @@ TRAVIS_DIR="$(dirname "${BASH_SOURCE[0]}")"
 source "$TRAVIS_DIR/_output_helpers.sh"
 
 # Parameters
-RUST_VERSION="${RUST_VERSION:-"nightly"}"
+RUSTCSV_RUST_VERSION="${RUSTCSV_RUST_VERSION:-"nightly"}"
 
 install_rust() {
-    # install rust + cargo nightly
+    # install rust + cargo
     # ============================
     CARGO_BIN=$HOME/.cargo/bin
     if ! test -d "$CARGO_BIN"; then
-        green "Installing rust + cargo"
+        green "Installing rust + cargo, version $RUSTCSV_RUST_VERSION"
         curl https://sh.rustup.rs -sSf \
-            | sh -s -- -y --default-toolchain "$RUST_VERSION"
+            | sh -s -- -y --default-toolchain "$RUSTCSV_RUST_VERSION"
     fi
     if ! grep "$CARGO_BIN" <<<"$PATH" &> /dev/null; then
         green "Adding $CARGO_BIN to \$PATH"