From 0ced5be683a03b81c31c8ca344d1d7a94d575b69 Mon Sep 17 00:00:00 2001 From: Joe Garcia <joe.garcia@ssec.wisc.edu> Date: Fri, 13 Nov 2015 14:12:00 -0600 Subject: [PATCH] clean up lazy scm install --- ShellB3/shallbethree.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index 89571b2e..f7e1db82 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -538,6 +538,7 @@ export SCIPYVER=0.16.1 # optional packages export DISTRIBUTEVER=0.6.28 export SETUPTOOLSVER=18.5 +export SETUPTOOLSSCMVER=1.8.0 export ATLASVER=3.10.1 export EUGENEVER=4.9.2 export HARFBUZZVER=1.0.6 @@ -3339,7 +3340,13 @@ mk_setuptools() { #_setup_build_install distribute src/optional/distribute-${DISTRIBUTEVER}.tar.gz distribute-${DISTRIBUTEVER} _setup_build_install setuptools src/optional/setuptools-${SETUPTOOLSVER}.tar.gz setuptools-${SETUPTOOLSVER} isDarwin && make_frameworklinks - pip_install src/optional/setuptools_scm-* || oops "setuptools_scm install failed" + return 0 +} + +mk_setuptools_scm() { + resume_tracker && return 0 + + _setup_build_install setuptools_scm src/optional/setuptools_scm-${SETUPTOOLSSCMVER}.tar.* setuptools_scm-${SETUPTOOLSSCMVER} || oops "setuptools_scm install failed" isDarwin && make_frameworklinks return 0 } @@ -5626,7 +5633,7 @@ mk_core() { && mk_libxml \ && mk_sqlite \ && mk_db48 \ - && mk_py && mk_pkgconfig && mk_setuptools \ + && mk_py && mk_pkgconfig && mk_setuptools && mk_setuptools_scm \ && mk_blas \ && mk_cblas \ && mk_lapack \ -- GitLab