From f60ed5952d91f5ddf2846f4896b865a5ed39c259 Mon Sep 17 00:00:00 2001 From: Bioconda Bot <47040946+BiocondaBot@users.noreply.github.com> Date: Sat, 4 Jan 2020 18:29:49 -0700 Subject: [PATCH] [ci skip] Merge PR 19541 Merge PR #19541, commits were: * try to cache rust builds * Update sourmash to 3.0.1 --- recipes/sourmash/build.sh | 4 +++- recipes/sourmash/meta.yaml | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes/sourmash/build.sh b/recipes/sourmash/build.sh index 7a6730fc30b284..26bb35df4274a4 100644 --- a/recipes/sourmash/build.sh +++ b/recipes/sourmash/build.sh @@ -7,10 +7,12 @@ set -o xtrace -o nounset -o pipefail -o errexit if [ "$(uname)" == "Darwin" ]; then # apparently the HOME variable isn't set correctly - export HOME=$(mktemp -d) + export HOME="/Users/distiller" # according to https://github.com/rust-lang/cargo/issues/2422#issuecomment-198458960 removing circle ci default configuration solves cargo trouble downloading crates git config --global --unset url.ssh://git@github.com.insteadOf || true fi +export RUSTC_WRAPPER=$(which sccache) + $PYTHON -m pip install --no-deps --ignore-installed -vv . diff --git a/recipes/sourmash/meta.yaml b/recipes/sourmash/meta.yaml index 7650e0ed8152e5..f1e0d088b0ad04 100644 --- a/recipes/sourmash/meta.yaml +++ b/recipes/sourmash/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.0.0" %} +{% set version = "3.0.1" %} package: name: sourmash @@ -6,7 +6,7 @@ package: source: url: https://pypi.io/packages/source/s/sourmash/sourmash-{{ version }}.tar.gz - sha256: f8b56b80142edc713594ae5790b390fd2fe0b4e4e0208fdd54e63a33a3b87038 + sha256: 0299903121f642abe38484cfae5a90461e95f5692a0aa0da249129eea076bf22 build: entry_points: @@ -24,6 +24,7 @@ requirements: - milksnake - setuptools_scm - setuptools_scm_git_archive + - sccache run: - python