From 5b4a787144468680c6239ea5db1361d163933071 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 12 Jan 2016 22:35:25 -0500 Subject: Change repo url, add deps --- jwst_lib/jwst_lib.ini | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/jwst_lib/jwst_lib.ini b/jwst_lib/jwst_lib.ini index 5a1f323..de90840 100644 --- a/jwst_lib/jwst_lib.ini +++ b/jwst_lib/jwst_lib.ini @@ -3,7 +3,8 @@ name : jwst_lib version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] -home : ssh://git@bitbucket.org/stsci_ssb/${package:name} +# The JWST repo layout is different: One repo for many packages. +home : ssh://git@bitbucket.org/stsci_ssb/jwst.git license : BSD summary : ${package:name} @@ -20,12 +21,14 @@ preserve_egg_dir: True [requirements] build : d2to1 + asdf-standard astropy >=1.1 stsci.distutils numpy setuptools python run : + asdf-standard astropy >=1.1 stsci.distutils numpy @@ -33,45 +36,21 @@ run : [test] imports : + jwst_lib commands : [cbc_build] linux : - function get_py_version() { - python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' - } - export -f get_py_version - - function set_py3k() { - version=`get_py_version` - major=`echo $$version | cut -d '.' -f 1` - minor=`echo $$version | cut -d '.' -f 2` - hotfix=`echo $$version | cut -d '.' -f 3` - if (( major > 2 )); then - export PY3K=1 - else - export PY3K=0 - fi - } - export -f set_py3k - - set_py3k - - pip install --no-deps --force --upgrade d2to1 - for d in * + for d in jwst_lib/* do - if [ $$PY3K -ne 0 ] ; then - ( cd $$d && 2to3 -w . ) - fi ( cd $$d && python setup.py install || exit 1 ) done windows : echo "Unsupported (yet?)" #python setup.py install - #2to3 -w . #if errorlevel 1 exit 1 -- cgit